hfs 0.42.3 → 0.44.0

package/src/langs/hfs-lang-ru.json

@@ -0,0 +1,106 @@
+{
+    "author": "Mefistofell, SanokKule",
+    "version": 1.92,
+    "hfs_version": "0.43.0",
+    "translate": {
+        "Select": "Выбор",
+        "n_files": "{n,plural, one{1 файл} few{# файла} other{# файлов}}",
+        "n_folders": "{n,plural, one{1 папка} few{# папки} other{# папок}}",
+        "filter_count": "{n,plural, one{1 элемент} few{# элемента} other{# элементов}}",
+        "select_count": "{n,plural, one{Выбран #} other{Выбрано #}}",
+        "filter_placeholder": "Введите текст для фильтрации списка",
+        "Select some files": "Выделите файлы",
+        "zip_checkboxes": "Выделите нужные файлы и снова нажмите zip",
+        "zip_tooltip_selected": "Скачать выбранные элементы в zip-архиве",
+        "zip_tooltip_whole": "Выбрать файлы для скачивания в zip-архиве. Если файлы не выбраны, то будет скачана вся папка",
+        "zip_confirm_search": "Скачать все результаты поиска в одном zip-архиве",
+        "zip_confirm_folder": "Скачать всю папку как zip-архив?",
+        "select_tooltip": "Выбор применяется к \"Zip\" и \"Удалить\" (если доступно), но также список можно отфильтровать",
+        "delete_hint": "Для удаления файлов сначала нажмите Выбор",
+        "delete_confirm": "Удалить {n,plural, =1{элемент} one{# элемент} few{# элемента} many{# элементов} other{# элементов}}?",
+        "delete_completed": "{n,plural, one{Удалён} other{Удалено}} {n,plural, one{# элемент} few{# элемента} many{# элементов} other{# элементов}}",
+        "delete_failed": ", {n} не удалось",
+        "delete_select": "Выделите элементы для удаления",
+        "Delete": "Удалить",
+        "Options": "Настройки",
+        "Search": "Поиск",
+        "Zip": "Zip",
+        "search_msg": "Поиск в текущей и вложенных папках",
+        "Searching": "Идёт поиск",
+        "Searched": "Результаты поиска",
+        "Clear search": "Отменить поиск",
+        "Interrupted": "Прерван",
+        "stopped_before": "Поиск остановлен",
+        "empty_list": "Здесь ничего нет",
+        "filter_none": "Ни один элемент не соответствует фильтру",
+        "Admin-panel": "Панель администратора",
+        "Login": "Вход",
+        "Username": "Имя пользователя",
+        "Password": "Пароль",
+        "login_untrusted": "Вход отменён: личности сервера нельзя доверять",
+        "login_bad_credentials": "Неверное имя пользователя или пароль",
+        "login_bad_cookies": "Не удалось войти - отключены cookies",
+        "User panel": "Панель пользователя",
+        "Change password": "Изменить пароль",
+        "enter_pass": "Введите новый пароль",
+        "enter_pass2": "Повторите пароль",
+        "pass2_mismatch": "Введённые пароли не совпадают",
+        "password_changed": "Пароль успешно изменён",
+        "Logout": "Выйти",
+        "connection error": "Ошибка соединения",
+        "Full timestamp:": "Дата и время: ",
+        "Search was interrupted": "Поиск прерван",
+        "Stop list": "Остановить",
+        "upload_starting": "Загрузка началась",
+        "wrong_account": "Пользователь {u} не имеет доступа к этой папке",
+        "no_upload_here": "Нет доступа к загрузке файлов в эту папку",
+        "Create folder": "Создать папку",
+        "Pick files": "Выбрать файлы",
+        "Pick folder": "Выбрать папку",
+        "send_files": "Загрузить {n,plural, one{# файл} few{# файла} many{# файлов} other{# файла}}, {size}",
+        "Clear": "Очистить",
+        "failed_upload": "Не удалась загрузить {name}",
+        "confirm_resume": "Возобновить загрузку?",
+        "file too large": "слишком большой файл",
+        "Enter folder name": "Введите имя папки",
+        "Successfully created": "Успешно создано",
+        "enter_folder": "Перейти в папку",
+        "folder_exists": "Папка уже существует",
+        "Sort by": "Сортировка по",
+        "name": "имени",
+        "extension": "расширению",
+        "size": "размеру",
+        "time": "времени",
+        "Invert order": "Инвертировать",
+        "Folders first": "Сначала папки",
+        "Numeric names": "Сначала цифры",
+        "theme:": "Тема:",
+        "auto": "авто",
+        "light": "светлая",
+        "dark": "тёмная",
+        "parent folder": "Родительская папка",
+        "home": "Домашняя папка",
+        "Continue": "Продолжить",
+        "Confirm": "Да",
+        "Don't": "Нет",
+        "Warning": "Внимание",
+        "Error": "Ошибка",
+        "Info": "Информация",
+        "Unauthorized": "Вход не выполнен",
+        "Forbidden": "Запрещено",
+        "Not found": "Не найдено",
+        "Server error": "Ошибка сервера",
+        "Upload": "Загрузить",
+        "upload_concluded": "Загрузка окончена:",
+        "upload_finished": "{n,plural, one{# файл загружен} few{# файла загружено} other{# файлов загружено}} ({size})",
+        "upload_errors": "{n,plural, one{# файл} few{# файла} other{# файлов}} не удалось загрузить",
+        "upload_file_rejected": "Некоторые файлы не были приняты",
+        "download counter": "Количество скачиваний",
+        "File menu": "Меню файла",
+        "Folder menu": "Меню папки",
+        "Name": "Имя",
+        "file_open": "Открыть",
+        "Download": "Скачать",
+        "Missing permission": "Отсутствует доступ"
+    }
+}

package/src/langs/hfs-lang-sr.json

@@ -0,0 +1,108 @@
+{
+    "author": "Горан",
+    "version": 1.6,
+    "hfs_version": "0.43.0",
+    "translate": {
+        "Select": "Изабери",
+        "n_files": "{n,plural, one {# документ} other{# документа}}",
+        "n_folders": "{n,plural, one {# фолдер} other{# фолдера}}",
+        "filter_count": "{n,plural, one{# ставка} other{# ставки}}",
+        "select_count": "{n,plural, one{# изабран} other{# изабранa}}",
+        "filter_placeholder": "Филтер",
+        "Select some files": "Изаберите неке документе",
+        "zip_checkboxes": "Изаберите жељене документе и поново притисните zip",
+        "zip_tooltip_selected": "Преузми изабране ставке у zip архиву",
+        "zip_tooltip_whole": "Изаберите датотеке за преузимање у zip архиви. Ако ниједан документ није изабран, цео директоријум ће бити преузет",
+        "zip_confirm_search": "Преузми све резултате претраге у једној зип архиви",
+        "zip_confirm_folder": "Сачувај цео директоријум у зип архиву?",
+        "select_tooltip": "Изаберите потребне датотеке",
+        "delete_hint": "Да бисте избрисали датотеке, прво притисните Изабери",
+        "delete_confirm": "Избриши {n,plural, one{1 елемент} =2 =3 =4 {# елеменaтa} other{# елементи}}?",
+        "delete_completed": "{n,plural,one{# елемент обрисан} other{# елемената обрисано}}",
+        "delete_failed": ", {n,plural,one{# неуспешно обрисан} other{# неуспешно обрисаних}}",
+        "delete_select": "Изабери ставке за брисање",
+        "Delete": "Избриши",
+        "Options": "Сортирање",
+        "Search": "Претрага",
+        "Zip": "Zip",
+        "search_msg": "Претражи тренутни фолдер и све подфолдере",
+        "Searching": "Претражујем...",
+        "Searched": "Резултати претраге",
+        "Clear search": "Откажи претрагу",
+        "Interrupted": "Прекинуто",
+        "stopped_before": "Претрага је заустављена",
+        "empty_list": "Празна листа",
+        "filter_none": "Ниједна ставка не одговара филтеру",
+        "Admin-panel": "Администратор-панел",
+        "Login": "Пријава",
+        "Username": "Корисничко име",
+        "Password": "Лозинка",
+        "Continue": "Настави",
+        "login_untrusted": "Пријава је прекинута",
+        "login_bad_credentials": "Неважеће корисничко име или лозинка",
+        "login_bad_cookies": "Пријава је прекинута. Колачићи су онемогућени",
+        "User panel": "Кориснички панел",
+        "Change password": "Промени лозинку",
+        "enter_pass": "Унесите нову лозинку",
+        "enter_pass2": "Поновите лозинку",
+        "pass2_mismatch": "Унете лозинке се не поклапају",
+        "password_changed": "Лозинка је успешно промењена",
+        "Logout": "Одјава",
+        "connection error": " Грешка везе ",
+        "Full timestamp:": "Датум и време: ",
+        "Search was interrupted": "Претрага је прекинута",
+        "Stop list": "Заустави",
+        "Upload": "Отпреми",
+        "upload_starting": "Отпремање је почело",
+        "wrong_account": "Корисник {u} нема приступ овом директоријуму",
+        "no_upload_here": "Немогуће отпремање овде",
+        "Create folder": "Креирај фолдер",
+        "Pick files": " Изаберите документ(а)",
+        "Pick folder": "Изаберите фолдер(е)",
+        "send_files": "Отпремите {n} документ(а), {size}",
+        "Clear": "Обриши",
+        "failed_upload": "Отпремање није успело {name}",
+        "confirm_resume": "Настави преузимање?",
+        "file too large": "Неважећа величина документа",
+        "Upload error": "Грешка при отпремању",
+        "Enter folder name": "Унесите назив фолдера",
+        "Successfully created": "Успешно креирано",
+        "enter_folder": "Иди у фолдер",
+        "folder_exists": "Фолдер већ постоји",
+        "finished": "учитано",
+        "Sort by": "Сортирај по",
+        "name": "Име",
+        "extension": " Екстензија",
+        "size": "Величина",
+        "time": "Време",
+        "Invert order": "Обрни редослед",
+        "Folders first": "Прво фолдери",
+        "Numeric names": "Прво бројеви",
+        "theme:": "Изглед:",
+        "auto": "Ауто",
+        "light": "Светло",
+        "dark": "Тамно",
+        "parent folder": "Надређени фолдер",
+        "home": "Почетна страна",
+        "Confirm": "Да",
+        "Don't": "Не",
+        "Warning": "Упозорење",
+        "Error": "Грешка",
+        "Info": "Информација",
+        "Unauthorized": "Пријава није успела",
+        "Forbidden": "Забрањено",
+        "Not found": "Није пронађено",
+        "Server error": " Сервер Грешка",
+        "upload_concluded": "Отпремање завршено:",
+        "upload_finished": "{n} пребачен(о) ({size})",
+        "upload_errors": "{n} неуспешно пребачен(их)",
+        "upload_file_rejected": "Нека документа нису прихваћена",
+        "download counter": "бројач преузимања",
+        "File menu": "Мени документа",
+        "Folder menu": "Мени фолдера",
+        "Name": "Име",
+        "file_open": "Отвори",
+        "Download": "Преузми",
+        "Missing permission": "Додељене дозволе онемогућавају преузимање докумената, фолдера"
+    }
+}

package/src/langs/hfs-lang-zh-tw.json

@@ -0,0 +1,106 @@
+{
+    "author": "Phoenix",
+    "version": 1.0,
+    "hfs_version": "0.43.0",
+    "translate": {
+        "Select": "選擇",
+        "n_files": "{n,plural,one{# 個檔案} other{# 個檔案}}",
+        "n_folders": "{n,plural,one{# 個資料夾} other{# 個資料夾}}",
+        "filter_count": "{n,plural, one{# 已過濾} other{# 已過濾}}",
+        "select_count": "{n,plural, one{# 已選擇} other{# 已選擇}}",
+        "filter_placeholder": "輸入內容,過濾下方列表",
+        "Select some files": "選擇一些檔案",
+        "zip_checkboxes": "使用選擇來複選檔案,然後再次使用Zip壓縮",
+        "zip_tooltip_selected": "將所選檔案下載為單一Zip壓縮檔",
+        "zip_tooltip_whole": "將整個列表（未過濾）作為單一Zip壓縮檔下載.如果選擇了一些檔案，則只會下載那些檔案",
+        "zip_confirm_search": "將此搜尋的所有結果下載為Zip壓縮檔?",
+        "zip_confirm_folder": "確認將整個資料夾下載為Zip壓縮檔?",
+        "select_tooltip": "選擇適用於\"Zip\"和\"刪除\"(如果有的話),也可以過濾列表",
+        "delete_hint": "請先點擊“選擇”某些項目,才能執行刪除.",
+        "delete_confirm": "確認刪除 {n,plural, one{# 項} other{# 項}}?",
+        "delete_completed": "刪除: {n} 完成",
+        "delete_failed": ", {n,plural, one{# 失敗} other{# 失敗}}",
+        "delete_select": "選擇要刪除的項目",
+        "Delete": "刪除",
+        "Options": "選項",
+        "Search": "搜尋",
+        "Zip": "Zip",
+        "search_msg": "搜尋目前資料夾和子資料夾",
+        "Searching": "搜尋中",
+        "Searched": "搜尋完成",
+        "Clear search": "清除搜尋條件",
+        "Interrupted": "中止",
+        "stopped_before": "已停止",
+        "empty_list": "空列表",
+        "filter_none": "過濾後無找到",
+        "Admin-panel": "管理面板",
+        "Login": "登入",
+        "Username": "使用者名稱",
+        "Password": "密碼",
+        "login_untrusted": "登入已中止：無法信任伺服器身份",
+        "login_bad_credentials": "帳號密碼錯誤",
+        "login_bad_cookies": "Cookies無法運作 - 登入失敗",
+        "User panel": "使用者面板",
+        "Change password": "修改密碼",
+        "enter_pass": "輸入新密碼",
+        "enter_pass2": "再次輸入相同的新密碼",
+        "pass2_mismatch": "密碼輸入不一致。修改失敗!",
+        "password_changed": "密碼修改成功",
+        "Logout": "登出",
+        "connection error": "連線錯誤",
+        "Full timestamp:": "完整的時間戳:",
+        "Search was interrupted": "搜尋已中止",
+        "Stop list": "停止",
+        "upload_starting": "開始下載",
+        "wrong_account": "使用者 {u} 沒有存取權限,請更換使用者",
+        "no_upload_here": "沒有上傳權限",
+        "Create folder": "建立資料夾",
+        "Pick files": "選擇檔案",
+        "Pick folder": "選擇資料夾",
+        "send_files": "開始上傳 {n,plural,one{# 檔案} other{# 檔案}}, {size}",
+        "Clear": "清空",
+        "failed_upload": "無法上傳 {name}",
+        "confirm_resume": "繼續上傳?",
+        "file too large": "檔案太大",
+        "Enter folder name": "輸入資料夾名稱",
+        "Successfully created": "建立成功",
+        "enter_folder": "進入資料夾",
+        "folder_exists": "已有相同名稱資料夾存在",
+        "Sort by": "排序依據",
+        "name": "檔案名稱",
+        "extension": "副檔名",
+        "size": "檔案大小",
+        "time": "檔案時間",
+        "Invert order": "倒序排列",
+        "Folders first": "資料夾先排序",
+        "Numeric names": "數字編號排序",
+        "theme:": "主題:",
+        "auto": "自動",
+        "light": "淺色",
+        "dark": "深色",
+        "parent folder": "上層資料夾",
+        "home": "主目錄",
+        "Continue": "繼續",
+        "Confirm": "確認",
+        "Don't": "取消",
+        "Warning": "警告",
+        "Error": "錯誤",
+        "Info": "資訊",
+        "Unauthorized": "未授權",
+        "Forbidden": "禁止",
+        "Not found": "找不到",
+        "Server error": "伺服器錯誤",
+        "Upload": "上傳",
+        "upload_concluded": "上傳完成:",
+        "upload_finished": "{n} 個檔案完成 ({size})",
+        "upload_errors": "{n} 失敗",
+        "upload_file_rejected": "部分檔案不被允許",
+        "download counter": "下載次數",
+        "File menu": "檔案選單",
+        "Folder menu": "資料夾選單",
+        "Name": "名稱",
+        "file_open": "開啟",
+        "Download": "下載",
+        "Missing permission": "權限不足"
+    }
+}

package/src/langs/hfs-lang-zh.json

@@ -0,0 +1,98 @@
+{
+    "author": "yx3016",
+    "version": 1.1,
+    "hfs_version": "0.40.1",
+    "translate": {
+        "Select": "选择",
+        "n_files": "{n} 个文件",
+        "n_folders": "{n} 个文件夹",
+        "filter_count": "{n} 通过筛选",
+        "select_count": "{n} 已选择",
+        "filter_placeholder": "输入筛选内容,筛选以下列表",
+        "Select some files": "去勾选文件!",
+        "zip_checkboxes": "点击复选框选择文件,然后再次使用Zip打包!",
+        "zip_tooltip_selected": "将所选元素下载为单个zip文件",
+        "zip_tooltip_whole": "将整个列表（未经过滤）作为一个zip文件下载.如果选择了一些元素，则只会下载这些元素.",
+        "zip_confirm_search": "将此搜索的所有结果下载为ZIP压缩包?",
+        "zip_confirm_folder": "确认将整个文件夹下载为ZIP压缩包?",
+        "select_tooltip": "选择适用于“Zip”和“删除”,也可以筛选列表.",
+        "delete_hint": "请先单击“选择”某个项目,才能执行删除.",
+        "delete_confirm": "确认删除 {n} 项?",
+        "delete_completed": "删除: {n} 成功!",
+        "delete_failed": "删除失败, {n,plural, one{# failed} other{# failed}}",
+        "delete_select": "选择要删除的内容",
+        "Delete": "删除",
+        "Options": "选项",
+        "Search": "搜索",
+        "Zip": "Zip",
+        "search_msg": "搜索当前文件夹和子文件夹",
+        "Searching": "搜索中...",
+        "Searched": "搜索完成!",
+        "Clear search": "清除搜索条件",
+        "Interrupted": "暂停",
+        "stopped_before": "已停止",
+        "empty_list": "空",
+        "filter_none": "无过滤",
+        "Admin-panel": "管理面板",
+        "Login": "登陆",
+        "Username": "用户名",
+        "Password": "密码",
+        "login_untrusted": "登录中止：服务器标识不可信!",
+        "login_bad_credentials": "证书参数有问题",
+        "login_bad_cookies": "Cookie错误-登录失败",
+        "User panel": "用户面板",
+        "Change password": "修改密码",
+        "enter_pass": "输入新密码",
+        "enter_pass2": "再次输入一遍密码",
+        "pass2_mismatch": "2次密码输入的不一致。修改失败!",
+        "password_changed": "密码修改成功",
+        "Logout": "注销",
+        "connection error": "链接错误",
+        "Full timestamp:": "完整的时间戳:",
+        "Search was interrupted": "搜索已中断",
+        "Stop list": "停止",
+        "upload_starting": "开始下载",
+        "wrong_account": "用户 {u} 没有访问权限,请更换用户",
+        "no_upload_here": "没有上传权限",
+        "Create folder": "创建文件夹",
+        "Pick files": "选择文件",
+        "Pick folder": "选择文件夹",
+        "send_files": "开始上传 {n,plural,one{# file} other{# files}}, {size}",
+        "Clear": "清空",
+        "failed_upload": "无法上传 {name}",
+        "confirm_resume": "是否重命名?",
+        "file too large": "文件太大",
+        "Enter folder name": "输入文件夹名称",
+        "Successfully created": "创建成功",
+        "enter_folder": "进入文件夹",
+        "folder_exists": "已存在同名文件夹",
+        "Sort by": "排序依据",
+        "name": "文件名",
+        "extension": "扩展名",
+        "size": "文件大小",
+        "time": "文件时间",
+        "Invert order": "降序",
+        "Folders first": "文件夹在前",
+        "Numeric names": "数字名称",
+        "theme:": "主题:",
+        "auto": "auto",
+        "light": "明亮",
+        "dark": "暗黑",
+        "parent folder": "上层文件夹",
+        "home": "根目录",
+        "Continue": "继续",
+        "Confirm": "确认",
+        "Don't": "取消",
+        "Warning": "警告",
+        "Error": "错误",
+        "Unauthorized": "未授权",
+        "Forbidden": "禁止",
+        "Not found": "未找到",
+        "Server error": "服务器错误",
+        "Upload": "上传",
+        "Upload terminated": "上传已终止",
+        "upload_finished": "上传{n} 结束 ({size})",
+        "upload_errors": "上传失败{n} 失败",
+        "download counter": "download 计数"
+    }
+}

package/src/listen.js

@@ -27,7 +27,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getUrls = exports.getServerStatus = exports.httpsPortCfg = exports.openAdmin = exports.portCfg = void 0;
+exports.getUrls = exports.getServerStatus = exports.httpsPortCfg = exports.openAdmin = exports.portCfg = exports.getHttpsWorkingPort = void 0;
 const http = __importStar(require("http"));
 const config_1 = require("./config");
 const index_1 = require("./index");
@@ -44,6 +44,11 @@ const lodash_1 = __importDefault(require("lodash"));
 let httpSrv;
 let httpsSrv;
 const openBrowserAtStart = (0, config_1.defineConfig)('open_browser_at_start', !const_1.DEV);
+function getHttpsWorkingPort() {
+    var _a;
+    return (httpsSrv === null || httpsSrv === void 0 ? void 0 : httpsSrv.listening) && ((_a = httpsSrv.address()) === null || _a === void 0 ? void 0 : _a.port);
+}
+exports.getHttpsWorkingPort = getHttpsWorkingPort;
 exports.portCfg = (0, config_1.defineConfig)('port', 80);
 exports.portCfg.sub(async (port) => {
     while (!index_1.app)
@@ -104,8 +109,8 @@ const considerHttps = (0, misc_1.debounceAsync)(async () => {
     httpsSrv.on('connection', connections_1.newConnection);
     printUrls(port, 'https');
 });
-const cert = (0, config_1.defineConfig)('cert');
-const privateKey = (0, config_1.defineConfig)('private_key');
+const cert = (0, config_1.defineConfig)('cert', '');
+const privateKey = (0, config_1.defineConfig)('private_key', '');
 const httpsNeeds = [cert, privateKey];
 const httpsOptions = { cert: '', private_key: '' };
 for (const cfg of httpsNeeds) {

package/src/log.js

@@ -38,6 +38,7 @@ const events_1 = __importDefault(require("./events"));
 const lodash_1 = __importDefault(require("lodash"));
 const util_files_1 = require("./util-files");
 const perm_1 = require("./perm");
+const misc_1 = require("./misc");
 class Logger {
     constructor(name) {
         this.name = name;
@@ -79,6 +80,7 @@ errorLogFile.sub(path => {
     accessErrorLog.setPath(path);
 });
 const logRotation = (0, config_1.defineConfig)('log_rotation', 'weekly');
+const dontLogNet = (0, config_1.defineConfig)('dont_log_net', '127.0.0.1|::1', misc_1.makeNetMatcher);
 function log() {
     const debounce = lodash_1.default.debounce(cb => cb(), 1000);
     return async (ctx, next) => {
@@ -87,6 +89,8 @@ function log() {
         console.debug(ctx.status, ctx.method, ctx.path);
         Promise.race([(0, stream_1.once)(ctx.res, 'finish'), (0, stream_1.once)(ctx.res, 'close')]).then(() => {
             var _a, _b, _c, _d;
+            if (dontLogNet.compiled()(ctx.ip))
+                return;
             const isError = ctx.status >= 400;
             const logger = isError && accessErrorLog || accessLogger;
             const rotate = (_a = logRotation.get()) === null || _a === void 0 ? void 0 : _a[0];
@@ -135,7 +139,7 @@ debugLogFile.on('open', () => {
     const was = console.error;
     console.error = function (...args) {
         was.apply(this, args);
-        const params = args.map(x => typeof x === 'string' ? x : JSON.stringify(x)).join(' ');
-        debugLogFile.write(new Date().toLocaleString() + ': ' + params + '\n');
+        args = args.map(x => { var _a; return typeof x === 'string' ? x : ((_a = (0, misc_1.tryJson)(x)) !== null && _a !== void 0 ? _a : String(x)); });
+        debugLogFile.write(new Date().toLocaleString() + ': ' + args.join(' ') + '\n');
     };
 }).on('error', () => console.log("cannot create debug.log"));

package/src/middlewares.js

@@ -4,9 +4,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.paramsDecoder = exports.prepareState = exports.getProxyDetected = exports.someSecurity = exports.serveGuiAndSharedFiles = exports.sessions = exports.headRequests = exports.gzipper = void 0;
+exports.paramsDecoder = exports.prepareState = exports.getProxyDetected = exports.someSecurity = exports.serveGuiAndSharedFiles = exports.headRequests = exports.gzipper = void 0;
 const koa_compress_1 = __importDefault(require("koa-compress"));
-const koa_session_1 = __importDefault(require("koa-session"));
 const const_1 = require("./const");
 const const_2 = require("./const");
 const vfs_1 = require("./vfs");
@@ -28,6 +27,10 @@ const formidable_1 = __importDefault(require("formidable"));
 const upload_1 = require("./upload");
 const adminApis_1 = require("./adminApis");
 const zlib_1 = require("zlib");
+const listen_1 = require("./listen");
+const config_1 = require("./config");
+const forceHttps = (0, config_1.defineConfig)('force_https', true);
+const ignoreProxies = (0, config_1.defineConfig)('ignore_proxies', false);
 exports.gzipper = (0, koa_compress_1.default)({
     threshold: 2048,
     gzip: { flush: zlib_1.constants.Z_SYNC_FLUSH },
@@ -52,13 +55,6 @@ const headRequests = async (ctx, next) => {
         ctx.response.length = length;
 };
 exports.headRequests = headRequests;
-const sessions = (app) => (0, koa_session_1.default)({
-    key: 'hfs_$id',
-    signed: true,
-    rolling: true,
-    maxAge: const_1.SESSION_DURATION,
-}, app);
-exports.sessions = sessions;
 const serveFrontendFiles = (0, serveGuiFiles_1.serveGuiFiles)(process.env.FRONTEND_PROXY, const_2.FRONTEND_URI);
 const serveFrontendPrefixed = (0, koa_mount_1.default)(const_2.FRONTEND_URI.slice(0, -1), serveFrontendFiles);
 const serveAdminFiles = (0, serveGuiFiles_1.serveGuiFiles)(process.env.ADMIN_PROXY, const_1.ADMIN_URI);
@@ -74,6 +70,13 @@ const serveGuiAndSharedFiles = async (ctx, next) => {
     }
     if (ctx.body)
         return next();
+    if (!ctx.secure && forceHttps.get() && (0, listen_1.getHttpsWorkingPort)() && !(0, misc_1.isLocalHost)(ctx)) {
+        const { URL } = ctx;
+        URL.protocol = 'https';
+        URL.port = (0, listen_1.getHttpsWorkingPort)();
+        ctx.status = 307; // this ensures the client doesn't switch to a simpler GET request
+        return ctx.redirect(URL.href);
+    }
     if (path.startsWith(const_2.FRONTEND_URI))
         return serveFrontendPrefixed(ctx, next);
     if (path.length === const_1.ADMIN_URI.length - 1 && const_1.ADMIN_URI.startsWith(path))
@@ -132,20 +135,20 @@ const serveGuiAndSharedFiles = async (ctx, next) => {
         : serveFrontendFiles(ctx, next);
 };
 exports.serveGuiAndSharedFiles = serveGuiAndSharedFiles;
-let proxyDetected = false;
+let proxyDetected;
 const someSecurity = async (ctx, next) => {
     ctx.request.ip = (0, connections_1.normalizeIp)(ctx.ip);
     try {
-        let proxy = ctx.get('X-Forwarded-For');
-        // we have some dev-proxies to ignore
-        if (const_1.DEV && proxy && [process.env.FRONTEND_PROXY, process.env.ADMIN_PROXY].includes(ctx.get('X-Forwarded-port')))
-            proxy = '';
         if ((0, misc_1.dirTraversal)(decodeURI(ctx.path)))
             return ctx.status = const_1.HTTP_FOOL;
         if ((0, block_1.applyBlock)(ctx.socket, ctx.ip))
             return;
-        proxyDetected || (proxyDetected = proxy > '');
-        ctx.state.proxiedFor = proxy;
+        if (!ctx.ips.length && ctx.get('X-Forwarded-For') // empty ctx.ips implies we didn't configure for proxies
+            // we have some dev-proxies to ignore
+            && !(const_1.DEV && [process.env.FRONTEND_PROXY, process.env.ADMIN_PROXY].includes(ctx.get('X-Forwarded-port')))) {
+            proxyDetected = ctx;
+            ctx.state.when = new Date();
+        }
     }
     catch (_a) {
         return ctx.status = const_1.HTTP_FOOL;
@@ -153,9 +156,12 @@ const someSecurity = async (ctx, next) => {
     return next();
 };
 exports.someSecurity = someSecurity;
-// this is only about http proxies
+// limited to http proxies
 function getProxyDetected() {
-    return proxyDetected;
+    if ((proxyDetected === null || proxyDetected === void 0 ? void 0 : proxyDetected.state.when) < Date.now() - const_1.DAY)
+        proxyDetected = undefined;
+    return !ignoreProxies.get() && proxyDetected
+        && { from: proxyDetected.ip, for: proxyDetected.get('X-Forwarded-For') };
 }
 exports.getProxyDetected = getProxyDetected;
 const prepareState = async (ctx, next) => {

package/src/misc.js

@@ -18,7 +18,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.try_ = exports.stream2string = exports.tryJson = exports.same = exports.matches = exports.matchesNet = exports.isLocalHost = exports.with_ = exports.typedKeys = exports.objRenameKey = exports.onOff = exports.pendingPromise = exports.onlyTruthy = exports.truthy = exports.pattern2filter = exports.onFirstEvent = exports.onProcessExit = exports.randomId = exports.getOrSet = exports.wantArray = exports.waitFor = exports.wait = exports.newObj = exports.setHidden = exports.prefix = exports.removeStarting = exports.enforceFinal = exports.debounceAsync = void 0;
+exports.try_ = exports.stream2string = exports.tryJson = exports.same = exports.matches = exports.makeMatcher = exports.makeNetMatcher = exports.isLocalHost = exports.with_ = exports.hasProp = exports.typedKeys = exports.objRenameKey = exports.onOff = exports.pendingPromise = exports.onlyTruthy = exports.truthy = exports.pattern2filter = exports.onFirstEvent = exports.onProcessExit = exports.randomId = exports.getOrSet = exports.wantArray = exports.waitFor = exports.wait = exports.newObj = exports.setHidden = exports.prefix = exports.removeStarting = exports.enforceFinal = exports.debounceAsync = void 0;
 const path_1 = require("path");
 const lodash_1 = __importDefault(require("lodash"));
 const assert_1 = __importDefault(require("assert"));
@@ -28,6 +28,7 @@ __exportStar(require("./util-files"), exports);
 const debounceAsync_1 = __importDefault(require("./debounceAsync"));
 exports.debounceAsync = debounceAsync_1.default;
 const micromatch_1 = require("micromatch");
+const cidr_tools_1 = __importDefault(require("cidr-tools"));
 function enforceFinal(sub, s) {
     return s.endsWith(sub) ? s : s + sub;
 }
@@ -165,6 +166,10 @@ function typedKeys(o) {
     return Object.keys(o);
 }
 exports.typedKeys = typedKeys;
+function hasProp(obj, key) {
+    return key in obj;
+}
+exports.hasProp = hasProp;
 function with_(par, cb) {
     return cb(par);
 }
@@ -174,16 +179,19 @@ function isLocalHost(c) {
     return ip && (ip === '::1' || ip.endsWith('127.0.0.1'));
 }
 exports.isLocalHost = isLocalHost;
-function matchesNet(ip, mask, emptyMaskReturns = false) {
-    if (typeof ip !== 'string')
-        ip = ip.ip;
-    return matches(ip, mask, emptyMaskReturns);
+function makeNetMatcher(mask, emptyMaskReturns = false) {
+    return !mask ? () => emptyMaskReturns
+        : mask.includes('/') ? (ip) => cidr_tools_1.default.contains(mask, ip)
+            : makeMatcher(mask);
+}
+exports.makeNetMatcher = makeNetMatcher;
+function makeMatcher(mask, emptyMaskReturns = false) {
+    return mask ? (0, micromatch_1.matcher)(mask.replace(/^(!)?/, '$1(') + ')') // adding () will allow us to use the pipe at root level
+        : () => emptyMaskReturns;
 }
-exports.matchesNet = matchesNet;
+exports.makeMatcher = makeMatcher;
 function matches(s, mask, emptyMaskReturns = false) {
-    if (!mask)
-        return emptyMaskReturns;
-    return (0, micromatch_1.isMatch)(s, '(' + mask + ')'); // adding () will allow us to use the pipe at root level
+    return makeMatcher(mask, emptyMaskReturns)(s); // adding () will allow us to use the pipe at root level
 }
 exports.matches = matches;
 function same(a, b) {