w-web-sso 1.1.11 → 1.1.13

package/docs/WWebSso.html

@@ -77,15 +77,16 @@
     <dd class="tag-description"><ul class="dummy"><li><p>WWebSso 單一登入(SSO)伺服器</p>
 <p>建立SSO web服務: 使用者登入/自動登入/登出, 自助註冊與email驗證, 變更/重設密碼與通知信,
 token發放/驗證/更新, 後台使用者/金鑰/IP管理與統計資訊, 以及供外部系統查驗token與使用者資訊之API</p>
-<p>來源IP(IP封鎖、調用頻率限制、新IP登錄與統計)取自資料通道請求標頭X-Forwarded-For之第一段(未驗證格式，無此標頭或為空才取連線位址)，
-本套件信任該標頭：直接對外提供服務(前方無反向代理)時，用戶端可任意填寫(規避封鎖、冒用他人IP、以任意字串登錄IP與統計)；
+<p>來源IP(IP封鎖、調用頻率限制、新IP登錄與統計)取自資料通道請求標頭X-Forwarded-For之第一段(最左)：須為合法IP(net.isIP)才採用且原樣不改寫，
+非IP字串(含標記、超長等)退回連線位址並限流記一筆warn；無此標頭或為空亦取連線位址。
+信任邊界：本套件信任該標頭且不做防偽造(偽造防護屬防火牆/反向代理之責)——直接對外提供服務(前方無反向代理)時，用戶端可任意填寫合法格式之IP(規避封鎖、冒用他人IP)；
 部署於反向代理後時，請由最外層受信任之代理覆寫(而非附加)該標頭。僅/api/cleanKpIpCallApi與/api/cleanKpAccountLoginFailed取連線位址，不受影響</p></li></ul></dd>
     
 
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="server_WWebSso.mjs.html">server/WWebSso.mjs</a>, <a href="server_WWebSso.mjs.html#line108">line 108</a>
+        <a href="server_WWebSso.mjs.html">server/WWebSso.mjs</a>, <a href="server_WWebSso.mjs.html#line109">line 109</a>
     </li></ul></dd>
     
 
@@ -2491,7 +2492,7 @@ token發放/驗證/更新, 後台使用者/金鑰/IP管理與統計資訊, 以
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.5</a> on Tue Oct 20 2026 15:03:56 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.5</a> on Fri Oct 23 2026 11:30:30 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/global.html

@@ -388,7 +388,7 @@ console.log(calcUsageSummary(freq, 'ip', ot('2026-10-20T10:30:00+08:00')))
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="src_fetchSsoMsg.mjs.html">src/fetchSsoMsg.mjs</a>, <a href="src_fetchSsoMsg.mjs.html#line121">line 121</a>
+        <a href="src_fetchSsoMsg.mjs.html">src/fetchSsoMsg.mjs</a>, <a href="src_fetchSsoMsg.mjs.html#line134">line 134</a>
     </li></ul></dd>
     
 
@@ -734,7 +734,7 @@ operatorId 可為操作者 id 或「操作者 id + 列識別」(只擋同一列
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="src_fetchSsoMsg.mjs.html">src/fetchSsoMsg.mjs</a>, <a href="src_fetchSsoMsg.mjs.html#line58">line 58</a>
+        <a href="src_fetchSsoMsg.mjs.html">src/fetchSsoMsg.mjs</a>, <a href="src_fetchSsoMsg.mjs.html#line71">line 71</a>
     </li></ul></dd>
     
 
@@ -3312,7 +3312,7 @@ why: 計時器之 async 回呼 reject 時無人接手, Node 預設即結束行
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.5</a> on Tue Oct 20 2026 15:03:56 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.5</a> on Fri Oct 23 2026 11:30:30 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/index.html

@@ -71,7 +71,7 @@
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.5</a> on Tue Oct 20 2026 15:03:56 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.5</a> on Fri Oct 23 2026 11:30:30 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/server_WWebSso.mjs.html

@@ -72,7 +72,7 @@ import WServHapiServer from 'w-serv-hapi/src/WServHapiServer.mjs'
 import WServOrm from 'w-serv-orm/src/WServOrm.mjs'
 import ds from '../src/schema/index.mjs'
 import * as s from '../src/plugins/mShare.mjs'
-import srLogInit, { maskToken, maskUrl, maskKv } from './srLog.mjs'
+import srLogInit, { maskToken, maskUrl, maskKv, capText } from './srLog.mjs'
 import srEmailInit from './srEmail.mjs'
 import procCore from './procCore.mjs'
 import procLang from './procLang.mjs'
@@ -89,8 +89,9 @@ import { defaultPasswordPolicy } from './defaultPasswordPolicy.mjs'
  * 建立SSO web服務: 使用者登入/自動登入/登出, 自助註冊與email驗證, 變更/重設密碼與通知信,
  * token發放/驗證/更新, 後台使用者/金鑰/IP管理與統計資訊, 以及供外部系統查驗token與使用者資訊之API
  *
- * 來源IP(IP封鎖、調用頻率限制、新IP登錄與統計)取自資料通道請求標頭X-Forwarded-For之第一段(未驗證格式，無此標頭或為空才取連線位址)，
- * 本套件信任該標頭：直接對外提供服務(前方無反向代理)時，用戶端可任意填寫(規避封鎖、冒用他人IP、以任意字串登錄IP與統計)；
+ * 來源IP(IP封鎖、調用頻率限制、新IP登錄與統計)取自資料通道請求標頭X-Forwarded-For之第一段(最左)：須為合法IP(net.isIP)才採用且原樣不改寫，
+ * 非IP字串(含標記、超長等)退回連線位址並限流記一筆warn；無此標頭或為空亦取連線位址。
+ * 信任邊界：本套件信任該標頭且不做防偽造(偽造防護屬防火牆/反向代理之責)——直接對外提供服務(前方無反向代理)時，用戶端可任意填寫合法格式之IP(規避封鎖、冒用他人IP)；
  * 部署於反向代理後時，請由最外層受信任之代理覆寫(而非附加)該標頭。僅/api/cleanKpIpCallApi與/api/cleanKpAccountLoginFailed取連線位址，不受影響
  *
  * @class
@@ -509,7 +510,7 @@ function WWebSso(WOrm, url, db, pathSettings, optExt = {}) {
         console.log('WServOrm init failed', err)
         throw err
     }
-    let { woItems, procOrm } = wp
+    let { woItems, procOrm, withTabLocks, guardWrite } = wp //withTabLocks / guardWrite: 每表一鍵之表鎖(多人同時編輯之寫入契約, 原則 10), procCore 與 procProtect 共用同一組
 
     //getWebInfor
     let getWebInfor = () => {
@@ -586,8 +587,10 @@ function WWebSso(WOrm, url, db, pathSettings, optExt = {}) {
         verifyEmailResultContent = fs.readFileSync(fpTpl, 'utf8')
     }
 
-    let p = procCore(woItems, procOrm, { srLog, srEmail, salt, minExpired, kpLang, passwordPolicy, allowUserRegistration, siteUrl, verifyBaseUrl })
+    let p = procCore(woItems, procOrm, { srLog, srEmail, salt, minExpired, kpLang, passwordPolicy, allowUserRegistration, siteUrl, verifyBaseUrl, withTabLocks, guardWrite })
     let pp = procProtect(woItems, p, {
+        procOrm, //系統直寫(自動封鎖、計時器登錄 IP)經 procOrm 且在表鎖內, 更新者記 'system'
+        withTabLocks,
         srLog, //app token 跳過速率封鎖時記 debug (ADR-052)
         minForAccountLoginFailed,
         numForAccountLoginFailed,
@@ -961,7 +964,7 @@ function WWebSso(WOrm, url, db, pathSettings, optExt = {}) {
                     // console.log('us', us)
 
                     //對外介接契約不輸出憑證欄(ADR-068): 介接端常以本清單同步使用者, 憑證會擴散至其資料庫與 log;
-                    //只在對外路由剝除, 後台 kpfun getUsersList 之整列存回依賴 tokenVerify(updateTabItems 以 ltdtmapping 補齊全欄)
+                    //只在對外路由剝除(後台 kpfun getUsersList 同樣不回傳 tokenVerify, T3; 存檔時伺服器專有欄位取庫內值, 不再依賴前端整列存回)
                     us = us.map(p.omitUserCredential)
 
                     return us
@@ -1007,8 +1010,8 @@ function WWebSso(WOrm, url, db, pathSettings, optExt = {}) {
                     //valueLog: key 非識別欄(id / account / email / name)時 value 可能即憑證(token / tokenVerify 等), 記 log 前需遮罩 (ADR-068)
                     let valueLog = maskKv(key, value)
 
-                    //info
-                    srLog.info({ event: 'api/getSsoUserInfor', token: maskToken(token), key, value: valueLog })
+                    //info, 先於欄位名白名單 (R-QKEY-01: 白名單於 p.checkTokenAndGetUserInfor 內、checkToken 之後, 被拒之查詢仍留稽核紀錄且 value 已遮罩)
+                    srLog.info({ event: 'api/getSsoUserInfor', token: maskToken(token), key: capText(key), value: valueLog })
 
                     //callApiByToken
                     pp.callApiByToken(token)
@@ -1263,7 +1266,8 @@ function WWebSso(WOrm, url, db, pathSettings, optExt = {}) {
                 if (!_strictStr(token, key, value)) return Promise.reject('tokenExpired')
                 //valueLog: 與 HTTP getSsoUserInfor 同規則, key 非識別欄時 value 可能即憑證, 記 log 前需遮罩 (ADR-068)
                 let valueLog = maskKv(key, value)
-                srLog.info({ event: 'kpfun-getUserInfor', token: maskToken(token), key, value: valueLog })
+                //(欄位名白名單於 p.checkTokenAndGetUserInfor 內、checkToken 之後, 見 R-QKEY-01; 此記錄先於白名單)
+                srLog.info({ event: 'kpfun-getUserInfor', token: maskToken(token), key: capText(key), value: valueLog })
                 //console.log('call getUserInfor...')
                 let r = await p.checkTokenAndGetUserInfor(token, key, value, { fun: funCheckAdmin, perm: 'readUsers' })
                 //console.log('call getUserInfor end')
@@ -1306,13 +1310,15 @@ function WWebSso(WOrm, url, db, pathSettings, optExt = {}) {
                 return rs
             },
 
-            updateUsersList: async (_t, token, lang, rows) => {
+            //optSave: 選用之第 4 參數 { baseline }(前端以 buildBaseline 對載入時畫面所見之列自算, 多人同時編輯之寫入契約 R-CONC-05); 未給即不帶基準(app 權杖直呼、已開啟之舊版頁面, 本 major 允許),
+            //格式 / 白名單由 procCore.parseSaveOpt 驗證, 不識者 reject saveBaselineFormat, 不降級為不帶基準; 此處只轉交, 不展開給 procOrm
+            updateUsersList: async (_t, token, lang, rows, optSave) => {
                 if (!_strictStr(token)) return Promise.reject('tokenExpired')
                 if (!isearr(rows) || !rows.every((r) => isestr(get(r, 'id', '')))) return Promise.reject('invalidRows')
                 srLog.info({ event: 'kpfun-updateUsersList', token: maskToken(token), lang })
                 //console.log('call updateUsersList...')
                 //內層 reject key 字串 (含 checkToken 之 tokenExpired) 直接透出回前端 (前端 $t 顯示)
-                let rs = await p.checkTokenAndUpdateUsersList(token, lang, rows, { fun: funCheckAdmin, perm: 'writeUsers' })
+                let rs = await p.checkTokenAndUpdateUsersList(token, lang, rows, { fun: funCheckAdmin, perm: 'writeUsers' }, optSave)
                 //console.log('call updateUsersList end')
                 return rs
             },
@@ -1326,12 +1332,13 @@ function WWebSso(WOrm, url, db, pathSettings, optExt = {}) {
                 return rs
             },
 
-            updateTokensList: async (_t, token, lang, rows) => {
+            //optSave: { baseline, baselineSession }(app 列嚴格整表基準、session 列逐列寬鬆基準; 見 users 同名參數說明)
+            updateTokensList: async (_t, token, lang, rows, optSave) => {
                 if (!_strictStr(token)) return Promise.reject('tokenExpired')
                 if (!isearr(rows) || !rows.every((r) => isestr(get(r, 'id', '')))) return Promise.reject('invalidRows')
                 srLog.info({ event: 'kpfun-updateTokensList', token: maskToken(token), lang })
                 //console.log('call updateTokensList...')
-                let rs = await p.checkTokenAndUpdateTokensList(token, rows, { fun: funCheckAdmin, perm: 'writeTokens' })
+                let rs = await p.checkTokenAndUpdateTokensList(token, rows, { fun: funCheckAdmin, perm: 'writeTokens' }, optSave)
                 //console.log('call updateTokensList end')
                 return rs
             },
@@ -1345,12 +1352,13 @@ function WWebSso(WOrm, url, db, pathSettings, optExt = {}) {
                 return rs
             },
 
-            updateIpsList: async (_t, token, lang, rows) => {
+            //optSave: { baseline }(見 users 同名參數說明)
+            updateIpsList: async (_t, token, lang, rows, optSave) => {
                 if (!_strictStr(token)) return Promise.reject('tokenExpired')
                 if (!isearr(rows) || !rows.every((r) => isestr(get(r, 'id', '')))) return Promise.reject('invalidRows')
                 srLog.info({ event: 'kpfun-updateIpsList', token: maskToken(token), lang })
                 //console.log('call updateIpsList...')
-                let rs = await p.checkTokenAndUpdateIpsList(token, rows, { fun: funCheckAdmin, perm: 'writeIps' })
+                let rs = await p.checkTokenAndUpdateIpsList(token, rows, { fun: funCheckAdmin, perm: 'writeIps' }, optSave)
                 //console.log('call updateIpsList end')
                 return rs
             },
@@ -1449,7 +1457,7 @@ export default WWebSso
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.5</a> on Tue Oct 20 2026 15:03:56 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.5</a> on Fri Oct 23 2026 11:30:30 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/server_getIgnoredOrmKeys.mjs.html

@@ -93,7 +93,7 @@ export default getIgnoredOrmKeys
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.5</a> on Tue Oct 20 2026 15:03:56 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.5</a> on Fri Oct 23 2026 11:30:30 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/server_lockSave.mjs.html

@@ -102,7 +102,7 @@ export default createLockSave
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.5</a> on Tue Oct 20 2026 15:03:56 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.5</a> on Fri Oct 23 2026 11:30:30 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/server_ormWrite.mjs.html

@@ -108,7 +108,7 @@ export default ormWrite
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.5</a> on Tue Oct 20 2026 15:03:56 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.5</a> on Fri Oct 23 2026 11:30:30 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/server_staLogs_resolveShellWorker.mjs.html

@@ -167,7 +167,7 @@ export default resolveShellWorker
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.5</a> on Tue Oct 20 2026 15:03:56 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.5</a> on Fri Oct 23 2026 11:30:30 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/server_wrapTimer.mjs.html

@@ -117,7 +117,7 @@ export default wrapTimer
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.5</a> on Tue Oct 20 2026 15:03:56 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.5</a> on Fri Oct 23 2026 11:30:30 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/src_components_Common_CheckYesNo.vue.html

@@ -188,7 +188,7 @@ export default {
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.5</a> on Tue Oct 20 2026 15:03:56 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.5</a> on Fri Oct 23 2026 11:30:30 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/src_fetchSsoMsg.mjs.html

@@ -89,6 +89,19 @@ function fill(url, kvs) {
 }
 
 
+//hasUrlParam: 網址範本是否含「恰一個」完整的 name=value 參數(R-QKEY-01 規則 5)
+//以參數分隔字元定界, 而非以參數字元排除: 參數名之前須為字串起點或 ? & " 空白, 參數值之後須為字串終點或 & # " 空白
+//  (" 與空白供單元測試以 data: 網址模擬 SSO 時, 範本位於 JSON 字串或文字內);
+//  key=tokenVerify、key=token+ (server 實得 "token ")、xkey=token、a=key=token、&key=token、/key=token、#key=token、token={sysToken}x 等
+//  僅子字串相符者不通過(原 indexOf 子字串檢查會通過); 同名參數出現兩次以上(key=token&key=id)亦不通過(server 收陣列而拒)
+function hasUrlParam(url, name, value) {
+    let esc = (s) => s.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')
+    let nAny = (url.match(new RegExp(`(?<=^|[?&"\\s])${esc(name)}=`, 'g')) || []).length
+    let nOne = (url.match(new RegExp(`(?<=^|[?&"\\s])${esc(name)}=${esc(value)}(?=$|[&#"\\s])`, 'g')) || []).length
+    return nAny === 1 && nOne === 1
+}
+
+
 /**
  * 代入 → 以 GET 打 SSO → 判 state → 驗資料型別, 成功回 SSO 之 msg
  *
@@ -183,7 +196,7 @@ async function convertUser(funConvertUser, u) {
 }
 
 
-export { fetchSsoMsg, convertUser }
+export { fetchSsoMsg, convertUser, hasUrlParam }
 </code></pre>
         </article>
     </section>
@@ -198,7 +211,7 @@ export { fetchSsoMsg, convertUser }
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.5</a> on Tue Oct 20 2026 15:03:56 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.5</a> on Fri Oct 23 2026 11:30:30 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/src_httpGetJson.mjs.html

@@ -100,7 +100,7 @@ export default httpGetJson
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.5</a> on Tue Oct 20 2026 15:03:56 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.5</a> on Fri Oct 23 2026 11:30:30 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/src_maskUrl.mjs.html

@@ -99,7 +99,7 @@ export default maskUrl
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.5</a> on Tue Oct 20 2026 15:03:56 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.5</a> on Fri Oct 23 2026 11:30:30 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/src_plugins_staUsage.mjs.html

@@ -237,7 +237,7 @@ export { getFreqVal, sumFreqVal, groupFreq, calcUsageSummary }
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.5</a> on Tue Oct 20 2026 15:03:56 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.5</a> on Fri Oct 23 2026 11:30:30 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/src_plugins_submitGuard.mjs.html

@@ -150,7 +150,7 @@ export default submitGuard
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.5</a> on Tue Oct 20 2026 15:03:56 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.5</a> on Fri Oct 23 2026 11:30:30 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "w-web-sso",
-  "version": "1.1.11",
+  "version": "1.1.13",
   "main": "dist/w-web-sso.umd.js",
   "dependencies": {
     "json5": "^2.2.3",
@@ -10,7 +10,7 @@
     "w-echarts-vue": "^1.0.19",
     "w-email": "^1.1.8",
     "w-serv-hapi": "^1.1.7",
-    "w-serv-orm": "^1.1.15",
+    "w-serv-orm": "^1.1.17",
     "w-syslog": "^1.0.34",
     "wsemi": "^1.9.21"
   },

package/server/WWebSso.mjs

@@ -25,7 +25,7 @@ import WServHapiServer from 'w-serv-hapi/src/WServHapiServer.mjs'
 import WServOrm from 'w-serv-orm/src/WServOrm.mjs'
 import ds from '../src/schema/index.mjs'
 import * as s from '../src/plugins/mShare.mjs'
-import srLogInit, { maskToken, maskUrl, maskKv } from './srLog.mjs'
+import srLogInit, { maskToken, maskUrl, maskKv, capText } from './srLog.mjs'
 import srEmailInit from './srEmail.mjs'
 import procCore from './procCore.mjs'
 import procLang from './procLang.mjs'
@@ -42,8 +42,9 @@ import { defaultPasswordPolicy } from './defaultPasswordPolicy.mjs'
  * 建立SSO web服務: 使用者登入/自動登入/登出, 自助註冊與email驗證, 變更/重設密碼與通知信,
  * token發放/驗證/更新, 後台使用者/金鑰/IP管理與統計資訊, 以及供外部系統查驗token與使用者資訊之API
  *
- * 來源IP(IP封鎖、調用頻率限制、新IP登錄與統計)取自資料通道請求標頭X-Forwarded-For之第一段(未驗證格式，無此標頭或為空才取連線位址)，
- * 本套件信任該標頭：直接對外提供服務(前方無反向代理)時，用戶端可任意填寫(規避封鎖、冒用他人IP、以任意字串登錄IP與統計)；
+ * 來源IP(IP封鎖、調用頻率限制、新IP登錄與統計)取自資料通道請求標頭X-Forwarded-For之第一段(最左)：須為合法IP(net.isIP)才採用且原樣不改寫，
+ * 非IP字串(含標記、超長等)退回連線位址並限流記一筆warn；無此標頭或為空亦取連線位址。
+ * 信任邊界：本套件信任該標頭且不做防偽造(偽造防護屬防火牆/反向代理之責)——直接對外提供服務(前方無反向代理)時，用戶端可任意填寫合法格式之IP(規避封鎖、冒用他人IP)；
  * 部署於反向代理後時，請由最外層受信任之代理覆寫(而非附加)該標頭。僅/api/cleanKpIpCallApi與/api/cleanKpAccountLoginFailed取連線位址，不受影響
  *
  * @class
@@ -462,7 +463,7 @@ function WWebSso(WOrm, url, db, pathSettings, optExt = {}) {
         console.log('WServOrm init failed', err)
         throw err
     }
-    let { woItems, procOrm } = wp
+    let { woItems, procOrm, withTabLocks, guardWrite } = wp //withTabLocks / guardWrite: 每表一鍵之表鎖(多人同時編輯之寫入契約, 原則 10), procCore 與 procProtect 共用同一組
 
     //getWebInfor
     let getWebInfor = () => {
@@ -539,8 +540,10 @@ function WWebSso(WOrm, url, db, pathSettings, optExt = {}) {
         verifyEmailResultContent = fs.readFileSync(fpTpl, 'utf8')
     }
 
-    let p = procCore(woItems, procOrm, { srLog, srEmail, salt, minExpired, kpLang, passwordPolicy, allowUserRegistration, siteUrl, verifyBaseUrl })
+    let p = procCore(woItems, procOrm, { srLog, srEmail, salt, minExpired, kpLang, passwordPolicy, allowUserRegistration, siteUrl, verifyBaseUrl, withTabLocks, guardWrite })
     let pp = procProtect(woItems, p, {
+        procOrm, //系統直寫(自動封鎖、計時器登錄 IP)經 procOrm 且在表鎖內, 更新者記 'system'
+        withTabLocks,
         srLog, //app token 跳過速率封鎖時記 debug (ADR-052)
         minForAccountLoginFailed,
         numForAccountLoginFailed,
@@ -914,7 +917,7 @@ function WWebSso(WOrm, url, db, pathSettings, optExt = {}) {
                     // console.log('us', us)
 
                     //對外介接契約不輸出憑證欄(ADR-068): 介接端常以本清單同步使用者, 憑證會擴散至其資料庫與 log;
-                    //只在對外路由剝除, 後台 kpfun getUsersList 之整列存回依賴 tokenVerify(updateTabItems 以 ltdtmapping 補齊全欄)
+                    //只在對外路由剝除(後台 kpfun getUsersList 同樣不回傳 tokenVerify, T3; 存檔時伺服器專有欄位取庫內值, 不再依賴前端整列存回)
                     us = us.map(p.omitUserCredential)
 
                     return us
@@ -960,8 +963,8 @@ function WWebSso(WOrm, url, db, pathSettings, optExt = {}) {
                     //valueLog: key 非識別欄(id / account / email / name)時 value 可能即憑證(token / tokenVerify 等), 記 log 前需遮罩 (ADR-068)
                     let valueLog = maskKv(key, value)
 
-                    //info
-                    srLog.info({ event: 'api/getSsoUserInfor', token: maskToken(token), key, value: valueLog })
+                    //info, 先於欄位名白名單 (R-QKEY-01: 白名單於 p.checkTokenAndGetUserInfor 內、checkToken 之後, 被拒之查詢仍留稽核紀錄且 value 已遮罩)
+                    srLog.info({ event: 'api/getSsoUserInfor', token: maskToken(token), key: capText(key), value: valueLog })
 
                     //callApiByToken
                     pp.callApiByToken(token)
@@ -1216,7 +1219,8 @@ function WWebSso(WOrm, url, db, pathSettings, optExt = {}) {
                 if (!_strictStr(token, key, value)) return Promise.reject('tokenExpired')
                 //valueLog: 與 HTTP getSsoUserInfor 同規則, key 非識別欄時 value 可能即憑證, 記 log 前需遮罩 (ADR-068)
                 let valueLog = maskKv(key, value)
-                srLog.info({ event: 'kpfun-getUserInfor', token: maskToken(token), key, value: valueLog })
+                //(欄位名白名單於 p.checkTokenAndGetUserInfor 內、checkToken 之後, 見 R-QKEY-01; 此記錄先於白名單)
+                srLog.info({ event: 'kpfun-getUserInfor', token: maskToken(token), key: capText(key), value: valueLog })
                 //console.log('call getUserInfor...')
                 let r = await p.checkTokenAndGetUserInfor(token, key, value, { fun: funCheckAdmin, perm: 'readUsers' })
                 //console.log('call getUserInfor end')
@@ -1259,13 +1263,15 @@ function WWebSso(WOrm, url, db, pathSettings, optExt = {}) {
                 return rs
             },
 
-            updateUsersList: async (_t, token, lang, rows) => {
+            //optSave: 選用之第 4 參數 { baseline }(前端以 buildBaseline 對載入時畫面所見之列自算, 多人同時編輯之寫入契約 R-CONC-05); 未給即不帶基準(app 權杖直呼、已開啟之舊版頁面, 本 major 允許),
+            //格式 / 白名單由 procCore.parseSaveOpt 驗證, 不識者 reject saveBaselineFormat, 不降級為不帶基準; 此處只轉交, 不展開給 procOrm
+            updateUsersList: async (_t, token, lang, rows, optSave) => {
                 if (!_strictStr(token)) return Promise.reject('tokenExpired')
                 if (!isearr(rows) || !rows.every((r) => isestr(get(r, 'id', '')))) return Promise.reject('invalidRows')
                 srLog.info({ event: 'kpfun-updateUsersList', token: maskToken(token), lang })
                 //console.log('call updateUsersList...')
                 //內層 reject key 字串 (含 checkToken 之 tokenExpired) 直接透出回前端 (前端 $t 顯示)
-                let rs = await p.checkTokenAndUpdateUsersList(token, lang, rows, { fun: funCheckAdmin, perm: 'writeUsers' })
+                let rs = await p.checkTokenAndUpdateUsersList(token, lang, rows, { fun: funCheckAdmin, perm: 'writeUsers' }, optSave)
                 //console.log('call updateUsersList end')
                 return rs
             },
@@ -1279,12 +1285,13 @@ function WWebSso(WOrm, url, db, pathSettings, optExt = {}) {
                 return rs
             },
 
-            updateTokensList: async (_t, token, lang, rows) => {
+            //optSave: { baseline, baselineSession }(app 列嚴格整表基準、session 列逐列寬鬆基準; 見 users 同名參數說明)
+            updateTokensList: async (_t, token, lang, rows, optSave) => {
                 if (!_strictStr(token)) return Promise.reject('tokenExpired')
                 if (!isearr(rows) || !rows.every((r) => isestr(get(r, 'id', '')))) return Promise.reject('invalidRows')
                 srLog.info({ event: 'kpfun-updateTokensList', token: maskToken(token), lang })
                 //console.log('call updateTokensList...')
-                let rs = await p.checkTokenAndUpdateTokensList(token, rows, { fun: funCheckAdmin, perm: 'writeTokens' })
+                let rs = await p.checkTokenAndUpdateTokensList(token, rows, { fun: funCheckAdmin, perm: 'writeTokens' }, optSave)
                 //console.log('call updateTokensList end')
                 return rs
             },
@@ -1298,12 +1305,13 @@ function WWebSso(WOrm, url, db, pathSettings, optExt = {}) {
                 return rs
             },
 
-            updateIpsList: async (_t, token, lang, rows) => {
+            //optSave: { baseline }(見 users 同名參數說明)
+            updateIpsList: async (_t, token, lang, rows, optSave) => {
                 if (!_strictStr(token)) return Promise.reject('tokenExpired')
                 if (!isearr(rows) || !rows.every((r) => isestr(get(r, 'id', '')))) return Promise.reject('invalidRows')
                 srLog.info({ event: 'kpfun-updateIpsList', token: maskToken(token), lang })
                 //console.log('call updateIpsList...')
-                let rs = await p.checkTokenAndUpdateIpsList(token, rows, { fun: funCheckAdmin, perm: 'writeIps' })
+                let rs = await p.checkTokenAndUpdateIpsList(token, rows, { fun: funCheckAdmin, perm: 'writeIps' }, optSave)
                 //console.log('call updateIpsList end')
                 return rs
             },