openwrt-mirror/luci
1
0
Fork 0
mirror of https://github.com/openwrt/luci.git synced 2025-12-21 23:34:34 +04:00
Code Issues Packages Projects Releases Wiki Activity

luci-mod-system: minor code fixes for repokeys and sshkeys

Browse Source 
Signed-off-by: Paul Donald <newtwen+github@gmail.com>
(cherry picked from commit 850867b6e4)
This commit is contained in:
Paul Donald
2025-10-13 14:33:23 +02:00
parent de7651ffef
commit 2b783f23e8
2 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
modules/luci-mod-system/htdocs/luci-static/resources/view/system/repokeys.js
View File

@@ -19,7 +19,7 @@ const safeList = [
]; ];
function isFileInSafeList(file){ function isFileInSafeList(file){
for (name of safeList) { for (let name of safeList) {
if (file === name) if (file === name)
return true; return true;
} }
@@ -27,7 +27,7 @@ function isFileInSafeList(file){
} }
function normalizeKey(s) { function normalizeKey(s) {
return s.replace(/\s+/g, ' ').trim(); return s?.replace(/\s+/g, ' ')?.trim();
} }
function determineKeyEnv() { function determineKeyEnv() {
@@ -51,10 +51,16 @@ function listKeyFiles() {
); );
} }
function safeText(str) {
return String(str).replace(/[&<>"']/g, s => ({
'&': '&amp;', '<': '&lt;', '>': '&gt;', '"': '&quot;', "'": '&#39;'
}[s]));
}
function renderKeyItem(pubkey) { function renderKeyItem(pubkey) {
const safeFile = isFileInSafeList(pubkey?.filename); const safeFile = isFileInSafeList(pubkey?.filename);
const lines = pubkey?.key?.trim()?.split('\n').map(line => const lines = pubkey?.key?.trim()?.split('\n').map(line =>
[ E('br'), E('code', line) ] [ E('br'), E('code', {}, [ safeText(line) ]) ]
).flat(); ).flat();
return E('div', { return E('div', {
class: 'item', class: 'item',
@@ -62,7 +68,7 @@ function renderKeyItem(pubkey) {
'data-file': pubkey?.filename, 'data-file': pubkey?.filename,
'data-key': normalizeKey(pubkey?.key) 'data-key': normalizeKey(pubkey?.key)
}, [ }, [
E('strong', [ pubkey?.filename || _('Unnamed key') ]), E('strong', {}, [ pubkey?.filename || _('Unnamed key') ]),
...lines ...lines
]); ]);
} }

10
modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js
View File

@@ -118,14 +118,14 @@ function renderKeyItem(pubkey) {
click: isReadonlyView ? null : removeKey, click: isReadonlyView ? null : removeKey,
'data-key': pubkey.src 'data-key': pubkey.src
}, [ }, [
E('strong', [ pubkey.comment || _('Unnamed key') ]), E('br'), E('strong', {}, [ pubkey.comment || _('Unnamed key') ]), E('br'),
E('small', [ E('small', {}, [
'%s, %s'.format(pubkey.type, pubkey.curve || _('%d Bit').format(pubkey.bits)), '%s, %s'.format(pubkey.type, pubkey.curve || _('%d Bit').format(pubkey.bits)),
pubkey.options ? E([], [ pubkey.options ? E([], {}, [
' / ', _('Options:'), ' ', ' / ', _('Options:'), ' ',
E('code', Object.keys(pubkey.options).sort().join(', ')) E('code', {}, [Object.keys(pubkey.options).sort().join(', ')])
]) : '', ]) : '',
E('br'), E('code', pubkey.fprint) E('br'), E('code', {}, [pubkey.fprint])
]) ])
]); ]);
} }