Skip to content

Commit ef136ba

Browse files
KOWX712KOWX712
committed
webui/patch: disallow invalid character
ref: bmax121/APatch@9315485 #1
1 parent 6a46322 commit ef136ba

8 files changed

Lines changed: 35 additions & 23 deletions

File tree

‎webui/index.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@
9898
<div class="home-card-title" data-i18n="status_not_installed_or_authenticated">Not installed or authenticated</div>
9999
<div class="home-card-subtitle" data-i18n="button_install">Click to install</div>
100100
</div>
101-
<md-filled-button id="authenticate">SuperKey</md-filled-button>
101+
<md-filled-button id="authenticate" data-i18n="title_superkey">SuperKey</md-filled-button>
102102
</div>
103103
<div class="card home-card content-padding hidden" id="working">
104104
<md-ripple></md-ripple>
@@ -185,7 +185,7 @@
185185
<div id="kernel-info"></div>
186186
</div>
187187
<div class="card content-padding" id="superkey">
188-
<div class="card-title" slot="headline">SuperKey</div>
188+
<div class="card-title" slot="headline" data-i18n="title_superkey">SuperKey</div>
189189
<md-outlined-text-field label="Set SuperKey" type="password" class="password-field" data-i18n="label_set_superkey">
190190
<md-icon-button toggle selected slot="trailing-icon">
191191
<md-icon><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 -960 960 960"><path d="M480-320q75 0 127.5-52.5T660-500q0-75-52.5-127.5T480-680q-75 0-127.5 52.5T300-500q0 75 52.5 127.5T480-320Zm0-72q-45 0-76.5-31.5T372-500q0-45 31.5-76.5T480-608q45 0 76.5 31.5T588-500q0 45-31.5 76.5T480-392Zm0 192q-146 0-266-81.5T40-500q54-137 174-218.5T480-800q146 0 266 81.5T920-500q-54 137-174 218.5T480-200Zm0-300Zm0 220q113 0 207.5-59.5T832-500q-50-101-144.5-160.5T480-720q-113 0-207.5 59.5T128-500q50 101 144.5 160.5T480-280Z" /></svg></md-icon>

‎webui/index.js‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,14 @@ function updateSuperkey(key) {
6161
}
6262

6363
function updateBtnState(value) {
64+
const isInvalid = /[$"'[\]`]/.test(value);
65+
const field = document.querySelector('#superkey .password-field');
66+
67+
field.error = isInvalid;
68+
field.errorText = isInvalid ? getString('msg_invalid_char') : '';
69+
6470
document.querySelector('#superkey-dialog .confirm').disabled = !value;
65-
document.getElementById('start').disabled = !value;
71+
document.getElementById('start').disabled = !value || isInvalid;
6672
}
6773

6874
export async function initInfo() {

‎webui/public/locales/strings/en.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
<string name="title_settings">Settings</string>
99
<string name="title_home">Home</string>
1010
<string name="title_language">Language</string>
11+
<string name="title_superkey">SuperKey</string>
1112
<string name="title_clear_superkey">Clear SuperKey</string>
1213
<string name="title_enter_superkey">Enter SuperKey</string>
1314
<string name="title_control_kpmodule">Control KPModule</string>
@@ -86,5 +87,6 @@
8687
<string name="msg_failed_get_module_info">Failed to get module info</string>
8788
<string name="msg_error_loading_apps">Error loading apps: </string>
8889
<string name="msg_error_rendering_apps">Error rendering apps: </string>
90+
<string name="msg_invalid_char">Superkey contains special characters: $ " ' [ ] `</string>
8991
<string name="msg_unknown">Unknown</string>
9092
</resources>

‎webui/public/locales/strings/id.xml‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<resources>
3+
<!-- UI Labels -->
34
<string name="title_exclude">Pengecualian</string>
45
<string name="title_settings">Pengaturan</string>
56
<string name="title_home">Beranda</string>
@@ -13,6 +14,7 @@
1314
<string name="title_reboot_bootloader">Mulai Ulang ke Bootloader</string>
1415
<string name="title_reboot_download">Mulai Ulang ke Mode Download</string>
1516
<string name="title_reboot_edl">Mulai Ulang ke EDL</string>
17+
<!-- Buttons -->
1618
<string name="button_install">Klik untuk menginstal</string>
1719
<string name="button_embed_kpm">Sematkan KPM</string>
1820
<string name="button_start">Mulai</string>
@@ -21,19 +23,22 @@
2123
<string name="button_load">Muat</string>
2224
<string name="button_unload">Lepas</string>
2325
<string name="button_refresh">Segarkan</string>
26+
<!-- Labels -->
2427
<string name="label_set_superkey">Atur SuperKey</string>
2528
<string name="label_input_control_parameters">Masukkan parameter kontrol:</string>
2629
<string name="label_parameters">Parameter</string>
2730
<string name="label_load_temporarily">Muat sementara</string>
2831
<string name="label_show_system_app">Tampilkan aplikasi sistem</string>
2932
<string name="label_system_default">Default Sistem</string>
3033
<string name="label_trigger_event">Event Pemicu</string>
34+
<!-- Status -->
3135
<string name="status_not_installed">Tidak terinstal</string>
3236
<string name="status_working">Berjalan</string>
3337
<string name="status_not_installed_or_authenticated">Tidak terinstal atau terautentikasi</string>
3438
<string name="status_authentication_failed">Autentikasi gagal</string>
3539
<string name="status_authentication_failed_desc">Gagal mengautentikasi SuperKey, sehingga KPatch Next tidak dapat bekerja dengan baik. Silakan coba lagi.</string>
3640
<string name="status_loading">Memuat...</string>
41+
<!-- Info -->
3742
<string name="info_kernel_version">Versi Kernel</string>
3843
<string name="info_system_version">Versi Sistem</string>
3944
<string name="info_selinux_status">Status SELinux</string>
@@ -49,6 +54,7 @@
4954
<string name="info_embedded">TERSEMAT</string>
5055
<string name="info_user">PENGGUNA %1$s</string>
5156
<string name="info_system">SISTEM</string>
57+
<!-- Messages -->
5258
<string name="msg_no_module_loaded">Tidak ada modul dimuat</string>
5359
<string name="msg_no_app_found">Aplikasi tidak ditemukan</string>
5460
<string name="msg_no_module_found">Modul tidak ditemukan</string>
@@ -73,5 +79,6 @@
7379
<string name="msg_failed_get_module_info">Gagal mendapatkan info modul</string>
7480
<string name="msg_error_loading_apps">Error memuat aplikasi: </string>
7581
<string name="msg_error_rendering_apps">Error merender aplikasi: </string>
82+
<string name="msg_invalid_char">Superkey mengandung karakter khusus: $ " ' [ ] `</string>
7683
<string name="msg_unknown">Tidak diketahui</string>
77-
</resources>
84+
</resources>

‎webui/public/locales/strings/pt-BR.xml‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<resources>
33
<!-- UI Labels -->
4-
<string name="title_patch">Patch</string>
5-
<string name="title_unpatch">UnPatch</string>
6-
<string name="title_kpmodule">KPModule</string>
74
<string name="title_exclude">Excluir</string>
85
<string name="title_settings">Configurações</string>
96
<string name="title_home">Início</string>
@@ -17,19 +14,17 @@
1714
<string name="title_reboot_bootloader">Reiniciar em Bootloader</string>
1815
<string name="title_reboot_download">Reiniciar em Download</string>
1916
<string name="title_reboot_edl">Reiniciar em EDL</string>
20-
<string name="title_kernel">Kernel</string>
2117
<!-- Buttons -->
2218
<string name="button_install">Instalar</string>
2319
<string name="button_uninstall">Desinstalar</string>
2420
<string name="button_embed_kpm">Incorporar KPM</string>
2521
<string name="button_start">Iniciar</string>
2622
<string name="button_unpatch">UnPatch</string>
2723
<string name="button_cancel">Cancelar</string>
28-
<string name="button_ok">OK</string>
2924
<string name="button_load">Carregar</string>
3025
<string name="button_unload">Descarregar</string>
3126
<string name="button_refresh">Atualizar</string>
32-
<!-- Labels -->
27+
<!-- Labels -->
3328
<string name="label_set_superkey">Definir SuperKey</string>
3429
<string name="label_input_control_parameters">Inserir parâmetros de controle:</string>
3530
<string name="label_parameters">Parâmetros</string>
@@ -44,7 +39,7 @@
4439
<string name="status_authentication_failed">Falha de autenticação</string>
4540
<string name="status_authentication_failed_desc">A SuperKey não pôde ser autenticada; o KPatch Next não pode operar corretamente. Tente novamente.</string>
4641
<string name="status_loading">Carregando...</string>
47-
<!-- Info -->
42+
<!-- Info -->
4843
<string name="info_kernel_version">Versão do kernel</string>
4944
<string name="info_system_version">Versão do sistema</string>
5045
<string name="info_fingerprint">Fingerprint</string>
@@ -61,7 +56,7 @@
6156
<string name="info_embedded">INCORPORADO</string>
6257
<string name="info_user">USUÁRIO %1$s</string>
6358
<string name="info_system">SISTEMA</string>
64-
<!-- Messages -->
59+
<!-- Messages -->
6560
<string name="msg_no_module_loaded">Nenhum módulo carregado</string>
6661
<string name="msg_no_app_found">Nenhum app encontrado</string>
6762
<string name="msg_no_module_found">Nenhum módulo encontrado</string>
@@ -86,5 +81,6 @@
8681
<string name="msg_failed_get_module_info">Falha ao obter informações do módulo</string>
8782
<string name="msg_error_loading_apps">Erro ao carregar apps: </string>
8883
<string name="msg_error_rendering_apps">Erro ao renderizar apps: </string>
84+
<string name="msg_invalid_char">Superkey contém caracteres especiais: $ " ' [ ] `</string>
8985
<string name="msg_unknown">Desconhecido</string>
90-
</resources>
86+
</resources>

‎webui/public/locales/strings/ru.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,5 +83,6 @@
8383
<string name="msg_failed_get_module_info">Не удалось получить информацию о модуле</string>
8484
<string name="msg_error_loading_apps">Ошибка загрузки приложений: </string>
8585
<string name="msg_error_rendering_apps">Ошибка отображения приложений: </string>
86+
<string name="msg_invalid_char">Superkey содержит специальные символы: $ " ' [ ] `</string>
8687
<string name="msg_unknown">Неизвестно</string>
8788
</resources>

‎webui/public/locales/strings/uk.xml‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<resources>
33
<!-- UI Labels -->
4-
<string name="title_patch">Patch</string>
5-
<string name="title_unpatch">UnPatch</string>
6-
<string name="title_kpmodule">KPModule</string>
74
<string name="title_exclude">Виключити</string>
85
<string name="title_settings">Налаштування</string>
96
<string name="title_home">Головна</string>
@@ -86,5 +83,6 @@
8683
<string name="msg_failed_get_module_info">Не вдалося отримати інформацію про модуль</string>
8784
<string name="msg_error_loading_apps">Помилка завантаження програм: </string>
8885
<string name="msg_error_rendering_apps">Помилка рендерингу програм: </string>
86+
<string name="msg_invalid_char">Superkey містить спеціальні символи: $ " ' [ ] `</string>
8987
<string name="msg_unknown">Невідомо</string>
90-
</resources>
88+
</resources>

‎webui/public/locales/strings/zh-CN.xml‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,15 @@
22
<resources>
33
<!-- UI Labels -->
44
<string name="title_patch">修补</string>
5-
<string name="title_unpatch">还原</string>
5+
<string name="title_unpatch">取消修补</string>
66
<string name="title_kpmodule">KPModule</string>
77
<string name="title_exclude">排除</string>
88
<string name="title_settings">设置</string>
99
<string name="title_home">首页</string>
1010
<string name="title_language">语言</string>
11-
<string name="title_clear_superkey">清除 SuperKey</string>
12-
<string name="title_enter_superkey">输入 SuperKey</string>
11+
<string name="title_superkey">超级密钥</string>
12+
<string name="title_clear_superkey">清除超级密钥</string>
13+
<string name="title_enter_superkey">输入超级密钥</string>
1314
<string name="title_control_kpmodule">控制 KPModule</string>
1415
<string name="title_select_language">选择语言</string>
1516
<string name="title_reboot">重启</string>
@@ -23,14 +24,14 @@
2324
<string name="button_uninstall">卸载</string>
2425
<string name="button_embed_kpm">嵌入 KPM</string>
2526
<string name="button_start">开始</string>
26-
<string name="button_unpatch">还原</string>
27+
<string name="button_unpatch">取消修补</string>
2728
<string name="button_cancel">取消</string>
2829
<string name="button_ok">确定</string>
2930
<string name="button_load">加载</string>
3031
<string name="button_unload">卸载</string>
3132
<string name="button_refresh">刷新</string>
3233
<!-- Labels -->
33-
<string name="label_set_superkey">设置 SuperKey</string>
34+
<string name="label_set_superkey">设置超级密钥</string>
3435
<string name="label_input_control_parameters">输入控制参数：</string>
3536
<string name="label_parameters">参数</string>
3637
<string name="label_load_temporarily">临时加载</string>
@@ -42,7 +43,7 @@
4243
<string name="status_working">运行中</string>
4344
<string name="status_not_installed_or_authenticated">未安装或未认证</string>
4445
<string name="status_authentication_failed">认证失败</string>
45-
<string name="status_authentication_failed_desc">无法认证 SuperKey，因此 KPatch Next 无法正常工作。请重试。</string>
46+
<string name="status_authentication_failed_desc">无法认证超级密钥，因此 KPatch Next 无法正常工作。请重试。</string>
4647
<string name="status_loading">加载中...</string>
4748
<!-- Info -->
4849
<string name="info_kernel_version">内核版本</string>
@@ -86,5 +87,6 @@
8687
<string name="msg_failed_get_module_info">获取模块信息失败</string>
8788
<string name="msg_error_loading_apps">加载应用时出错：</string>
8889
<string name="msg_error_rendering_apps">渲染应用时出错：</string>
90+
<string name="msg_invalid_char">超级密钥包含特殊字符: $ " ' [ ] `</string>
8991
<string name="msg_unknown">未知</string>
9092
</resources>

0 commit comments

Comments
 (0)