w-web-sso 1.0.13 → 1.0.15

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (76) hide show
  1. package/db/wsso/ips/data.mdb +0 -0
  2. package/db/wsso/ips/lock.mdb +0 -0
  3. package/db/wsso/tokens/data.mdb +0 -0
  4. package/db/wsso/tokens/lock.mdb +0 -0
  5. package/db/wsso/users/data.mdb +0 -0
  6. package/db/wsso/users/lock.mdb +0 -0
  7. package/dist/css/{app.03a2f95c.css → app.e4367a2b.css} +1 -1
  8. package/dist/index.tmp +6 -2
  9. package/dist/js/app-legacy.4ebeee34.js +2 -0
  10. package/dist/js/app-legacy.4ebeee34.js.map +1 -0
  11. package/dist/js/app.d1707f92.js +2 -0
  12. package/dist/js/app.d1707f92.js.map +1 -0
  13. package/dist/js/chunk-vendors-legacy.7380957a.js +15 -0
  14. package/dist/js/chunk-vendors-legacy.7380957a.js.map +1 -0
  15. package/dist/js/chunk-vendors.7380957a.js +15 -0
  16. package/dist/js/chunk-vendors.7380957a.js.map +1 -0
  17. package/dist/w-web-sso.umd.js +2 -2
  18. package/dist/w-web-sso.umd.js.map +1 -1
  19. package/docs/WWebSso.html +4 -112
  20. package/docs/WWebSso.mjs.html +460 -111
  21. package/docs/index.html +1 -1
  22. package/g.getSettings.mjs +0 -1
  23. package/g.initialData.mjs +8 -10
  24. package/g.mjs +0 -0
  25. package/package.json +7 -6
  26. package/public/index.html +13 -0
  27. package/server/WWebSso.mjs +459 -110
  28. package/server/procCore.mjs +871 -277
  29. package/server/procProtect.mjs +746 -0
  30. package/server/procStaInfor.mjs +393 -0
  31. package/server/provideUsers.mjs +0 -1
  32. package/server/srlog.mjs +12 -0
  33. package/server/staLogs/staIp.callWorker.mjs +35 -0
  34. package/server/staLogs/staIp.mjs +118 -0
  35. package/server/staLogs/staIp.shellWorker.mjs +18 -0
  36. package/server/staLogs/staToken.callWorker.mjs +35 -0
  37. package/server/staLogs/staToken.mjs +118 -0
  38. package/server/staLogs/staToken.shellWorker.mjs +18 -0
  39. package/server/staLogs/staUserAccountLogin.callWorker.mjs +35 -0
  40. package/server/staLogs/staUserAccountLogin.mjs +136 -0
  41. package/server/staLogs/staUserAccountLogin.shellWorker.mjs +18 -0
  42. package/server/staLogs/test_staIp.mjs +27 -0
  43. package/server/staLogs/test_staToken.mjs +27 -0
  44. package/server/staLogs/test_staUserAccountLogin.mjs +30 -0
  45. package/settings.json +15 -1
  46. package/src/components/Layout.vue +70 -15
  47. package/src/components/LayoutContent.vue +35 -33
  48. package/src/components/LayoutContentIps.vue +757 -0
  49. package/src/components/LayoutContentStaInfor.vue +917 -0
  50. package/src/components/LayoutContentTokens.vue +961 -0
  51. package/src/components/{LayoutContentInfor.vue → LayoutContentUserInfor.vue} +366 -73
  52. package/src/components/LayoutContentUsers.vue +21 -34
  53. package/src/components/PageLogin.vue +1 -1
  54. package/src/components/VeUser.vue.txt +9 -10
  55. package/src/components/ruleGroup.vue.txt +5 -6
  56. package/src/main.js +7 -13
  57. package/src/plugins/mLang.mjs +853 -520
  58. package/src/plugins/mShare.mjs +141 -3
  59. package/src/plugins/mUI.mjs +30 -21
  60. package/src/schema/index.mjs +2 -0
  61. package/src/schema/tables/ips.mjs +0 -9
  62. package/src/schema/tables/tokens.mjs +5 -1
  63. package/src/schema/tables/users.mjs +2 -14
  64. package/src/store/mutations.mjs +3 -3
  65. package/src/store/types.mjs +1 -1
  66. package/srv.mjs +55 -38
  67. package/_/350/246/217/345/212/203.md +0 -275
  68. package/dist/js/app-legacy.d468ef7f.js +0 -2
  69. package/dist/js/app-legacy.d468ef7f.js.map +0 -1
  70. package/dist/js/app.d468ef7f.js +0 -2
  71. package/dist/js/app.d468ef7f.js.map +0 -1
  72. package/dist/js/chunk-vendors-legacy.f51f58bb.js +0 -13
  73. package/dist/js/chunk-vendors-legacy.f51f58bb.js.map +0 -1
  74. package/dist/js/chunk-vendors.f51f58bb.js +0 -13
  75. package/dist/js/chunk-vendors.f51f58bb.js.map +0 -1
  76. package/src/components/LayoutContentSettings.vue +0 -1248
@@ -6,6 +6,7 @@ import isestr from 'wsemi/src/isestr.mjs'
6
6
  import ispint from 'wsemi/src/ispint.mjs'
7
7
  import isearr from 'wsemi/src/isearr.mjs'
8
8
  import ispnum from 'wsemi/src/ispnum.mjs'
9
+ import isErr from 'wsemi/src/isErr.mjs'
9
10
  import isfun from 'wsemi/src/isfun.mjs'
10
11
  import cint from 'wsemi/src/cint.mjs'
11
12
  import strleft from 'wsemi/src/strleft.mjs'
@@ -18,7 +19,11 @@ import replace from 'wsemi/src/replace.mjs'
18
19
  import WServHapiServer from 'w-serv-hapi/src/WServHapiServer.mjs'
19
20
  import WServOrm from 'w-serv-orm/src/WServOrm.mjs'
20
21
  import ds from '../src/schema/index.mjs'
22
+ import * as s from '../src/plugins/mShare.mjs'
23
+ import srlog from './srlog.mjs'
21
24
  import procCore from './procCore.mjs'
25
+ import procProtect from './procProtect.mjs'
26
+ import procStaInfor from './procStaInfor.mjs'
22
27
  import procSettings from './procSettings.mjs'
23
28
 
24
29
 
@@ -27,11 +32,8 @@ import procSettings from './procSettings.mjs'
27
32
  *
28
33
  * @class
29
34
  * @param {Function} WOrm 輸入資料庫ORM函數
30
- * @param {String} url 輸入資料庫連線字串,例如w-orm-lmdb為'./db',或w-orm-mongodb為'mongodb://sername:password@$127.0.0.1:27017'
35
+ * @param {String} url 輸入資料庫連線字串,例如w-orm-lmdb為'./db',或w-orm-mongodb為'mongodb://username:password@$127.0.0.1:27017'
31
36
  * @param {String} db 輸入資料庫名稱字串
32
- * @param {Function} getUserByToken 輸入處理函數,函數會傳入使用者token,通過此函數處理後並回傳使用者資訊物件,並至少須提供'id'、'email'、'name'、'isAdmin'欄位,且'isAdmin'限輸入'y'或'n',且輸入'y'時會複寫權限系統該使用者之'isAdmin'欄位值
33
- * @param {Function} verifyClientUser 輸入驗證瀏覽使用者身份之處理函數,函數會傳入使用者資訊物件,通過此函數識別後回傳布林值,允許使用者回傳true,反之回傳false
34
- * @param {Function} verifyAppUser 輸入驗證應用程序使用者身份之處理函數,函數會傳入使用者資訊物件,通過此函數識別後回傳布林值,允許使用者回傳true,反之回傳false
35
37
  * @param {String} [pathSettings='./settings'] 輸入設定檔案路徑字串,預設'./settings'
36
38
  * @returns {Object} 回傳物件,其內server為hapi伺服器實體,wsrv為w-converhp的伺服器事件物件,wsds為w-serv-webdata的伺服器事件物件,可監聽error事件
37
39
  * @example
@@ -39,7 +41,7 @@ import procSettings from './procSettings.mjs'
39
41
  *
40
42
  *
41
43
  */
42
- function WWebSso(WOrm, url, db, getUserByToken, verifyClientUser, verifyAppUser, pathSettings) {
44
+ function WWebSso(WOrm, url, db, pathSettings) {
43
45
  let instWServHapiServer = null
44
46
 
45
47
 
@@ -64,27 +66,6 @@ function WWebSso(WOrm, url, db, getUserByToken, verifyClientUser, verifyAppUser,
64
66
  }
65
67
 
66
68
 
67
- //check getUserByToken
68
- if (!isfun(getUserByToken)) {
69
- console.log('invalid getUserByToken', getUserByToken)
70
- throw new Error('invalid getUserByToken')
71
- }
72
-
73
-
74
- //check verifyClientUser
75
- if (!isfun(verifyClientUser)) {
76
- console.log('invalid verifyClientUser', verifyClientUser)
77
- throw new Error('invalid verifyClientUser')
78
- }
79
-
80
-
81
- //check verifyAppUser
82
- if (!isfun(verifyAppUser)) {
83
- console.log('invalid verifyAppUser', verifyAppUser)
84
- throw new Error('invalid verifyAppUser')
85
- }
86
-
87
-
88
69
  //check pathSettings
89
70
  if (!fsIsFile(pathSettings)) {
90
71
  pathSettings = './settings.json'
@@ -97,14 +78,29 @@ function WWebSso(WOrm, url, db, getUserByToken, verifyClientUser, verifyAppUser,
97
78
 
98
79
  //getSettings
99
80
  let opt = procSettings.getSettings()
81
+ // console.log('opt', opt)
100
82
  // * @param {Object|String} [opt={}] 輸入設定物件或設定檔檔案路徑字串,若給予檔案路徑則會預設檔案為json格式且讀入成為opt物件,預設{}
101
- // * @param {Integer} [opt.serverPort=11007] 輸入伺服器通訊port,預設11006
83
+ // * @param {Integer} [opt.serverPort=11007] 輸入伺服器通訊port整數,預設11007
102
84
  // * @param {Boolean} [opt.useCheckUser=false] 輸入是否檢查使用者資訊布林值,預設false
103
85
  // * @param {Function} [opt.getUserById=null] 輸入當useCheckUser=true時依照使用者ID取得使用者資訊物件函數,預設null
104
86
  // * @param {Boolean} [opt.useExcludeWhenNotAdmin=false] 輸入使用ORM的select方法時是否自動刪除數據內isActive欄位之布林值,預設false
105
87
  // * @param {Object} [opt.webName={}] 輸入站台名稱物件,至少包含語系eng與cht鍵的名稱,預設{}
106
88
  // * @param {Object} [opt.webDescription={}] 輸入站台描述物件,至少包含語系eng與cht鍵的名稱,預設{}
107
89
  // * @param {String} [opt.webLogo=''] 輸入站台logo字串,採base64格式,預設''
90
+ // * @param {Array} [opt.webBackgoundGradientColors=['#FFE0B2', '#FFCC80', '#FFF59D', '#F2D6A2', '#F0CC88']] 輸入使用者登入頁顏色陣列,前3色為背景線性linear-gradient,第4色為登入區塊背景色,第5色為站台logo背景色,若不給則預設白色。預設['#FFE0B2', '#FFCC80', '#FFF59D', '#F2D6A2', '#F0CC88']
91
+ // * @param {String} [opt.webKey=''] 輸入站台識別字串,預設''
92
+ // * @param {String} [opt.salt=''] 輸入密碼加鹽字串,預設''
93
+ // * @param {Integer} [opt.minExpired=30] 輸入創建或更新金鑰有效時間整數,單位分鐘(min),預設30
94
+ // * @param {Integer} [opt.minForAccountLoginFailed=10] 輸入限制帳號最大登入失敗(密碼錯誤)次數之判準時間整數,單位分鐘(min),預設10
95
+ // * @param {Integer} [opt.numForAccountLoginFailed=3] 輸入限制帳號最大登入失敗(密碼錯誤)之次數整數,預設3
96
+ // * @param {Integer} [opt.minBlockForAccountLoginFailed=30] 輸入限制帳號最大登入失敗(密碼錯誤)次數之觸發後封鎖時間整數,單位分鐘(min),預設30
97
+ // * @param {Integer} [opt.minForTokenCallApi=10] 輸入限制token最大調用API次數之判準時間整數,單位分鐘(min),預設10
98
+ // * @param {Integer} [opt.numForTokenCallApi=1000] 輸入限制token最大調用API之次數整數,預設1000
99
+ // * @param {Integer} [opt.minBlockForTokenCallApi=30] 輸入限制token最大調用API次數之觸發後封鎖時間整數,單位分鐘(min),預設30
100
+ // * @param {Integer} [opt.minForIpCallApi=10] 輸入限制IP最大調用API次數之判準時間整數,單位分鐘(min),預設10
101
+ // * @param {Integer} [opt.numForIpCallApi=10000] 輸入限制IP最大調用API之次數整數,預設10000
102
+ // * @param {Integer} [opt.minBlockForIpCallApi=30] 輸入限制IP最大調用API次數之觸發後封鎖時間整數,單位分鐘(min),預設30
103
+ // * @param {String} [opt.userLogo=''] 輸入使用者logo字串,採base64格式,預設''
108
104
  // * @param {String} [opt.subfolder=''] 輸入站台所在子目錄字串,提供站台位於內網採反向代理進行服務時,故需支援位於子目錄情形,預設''
109
105
  // * @param {String} [opt.mappingBy='email'] 輸入外部系統識別使用者token後所提供之資料物件,與權限系統之使用者資料物件,兩者間查找之對應欄位,可選'id'、'email'、'name',預設'email'
110
106
 
@@ -144,7 +140,7 @@ function WWebSso(WOrm, url, db, getUserByToken, verifyClientUser, verifyAppUser,
144
140
  //webBackgoundGradientColors
145
141
  let webBackgoundGradientColors = get(opt, 'webBackgoundGradientColors', [])
146
142
  if (!isearr(webBackgoundGradientColors)) {
147
- webBackgoundGradientColors = ['#FFE0B2', '#FFCC80', '#FFF59D']
143
+ webBackgoundGradientColors = ['#FFE0B2', '#FFCC80', '#FFF59D', '#F2D6A2', '#F0CC88']
148
144
  }
149
145
 
150
146
 
@@ -156,12 +152,84 @@ function WWebSso(WOrm, url, db, getUserByToken, verifyClientUser, verifyAppUser,
156
152
  let salt = get(opt, 'salt', '')
157
153
 
158
154
 
159
- //timeExpired
160
- let timeExpired = get(opt, 'timeExpired', '')
161
- if (ispnum(timeExpired)) {
162
- timeExpired = 30
155
+ //minExpired, 使用者成功登入後產生token之有效時間(分鐘)
156
+ let minExpired = get(opt, 'minExpired', '')
157
+ if (!ispnum(minExpired)) {
158
+ minExpired = 30
159
+ }
160
+
161
+
162
+ //minForAccountLoginFailed, 限制帳號最大登入失敗(密碼錯誤)次數之判準時間(分鐘)
163
+ let minForAccountLoginFailed = get(opt, 'minForAccountLoginFailed', '')
164
+ if (!ispnum(minForAccountLoginFailed)) {
165
+ minForAccountLoginFailed = 10
166
+ }
167
+
168
+
169
+ //numForAccountLoginFailed, 限制帳號最大登入失敗(密碼錯誤)之次數
170
+ let numForAccountLoginFailed = get(opt, 'numForAccountLoginFailed', '')
171
+ if (!ispnum(numForAccountLoginFailed)) {
172
+ numForAccountLoginFailed = 3
173
+ }
174
+
175
+
176
+ //minBlockForAccountLoginFailed, 限制帳號最大登入失敗(密碼錯誤)次數之觸發後封鎖時間(分鐘)
177
+ let minBlockForAccountLoginFailed = get(opt, 'minBlockForAccountLoginFailed', '')
178
+ if (!ispnum(minBlockForAccountLoginFailed)) {
179
+ minBlockForAccountLoginFailed = 30
180
+ }
181
+
182
+
183
+ //minForTokenCallApi, 限制token最大調用API次數之判準時間(分鐘)
184
+ let minForTokenCallApi = get(opt, 'minForTokenCallApi', '')
185
+ if (!ispnum(minForTokenCallApi)) {
186
+ minForTokenCallApi = 10
187
+ }
188
+
189
+
190
+ //numForTokenCallApi, 限制token最大調用API之次數
191
+ let numForTokenCallApi = get(opt, 'numForTokenCallApi', '')
192
+ if (!ispnum(numForTokenCallApi)) {
193
+ numForTokenCallApi = 1000
194
+ }
195
+
196
+
197
+ //minBlockForTokenCallApi, 限制token最大調用API次數之觸發後封鎖時間(分鐘)
198
+ let minBlockForTokenCallApi = get(opt, 'minBlockForTokenCallApi', '')
199
+ if (!ispnum(minBlockForTokenCallApi)) {
200
+ minBlockForTokenCallApi = 30
201
+ }
202
+
203
+
204
+ //minForIpCallApi, 限制IP最大調用API次數之判準時間(分鐘)
205
+ let minForIpCallApi = get(opt, 'minForIpCallApi', '')
206
+ if (!ispnum(minForIpCallApi)) {
207
+ minForIpCallApi = 10
163
208
  }
164
209
 
210
+
211
+ //numForIpCallApi, 限制IP最大調用API之次數
212
+ let numForIpCallApi = get(opt, 'numForIpCallApi', '')
213
+ if (!ispnum(numForIpCallApi)) {
214
+ numForIpCallApi = 10000
215
+ }
216
+
217
+
218
+ //minBlockForIpCallApi, 限制IP最大調用API次數之觸發後封鎖時間(分鐘)
219
+ let minBlockForIpCallApi = get(opt, 'minBlockForIpCallApi', '')
220
+ if (!ispnum(minBlockForIpCallApi)) {
221
+ minBlockForIpCallApi = 30
222
+ }
223
+
224
+
225
+ //是否啟用要求使用者定期更換密碼
226
+ // 若是,預設6個月更換密碼,是否允許使用同樣密碼
227
+
228
+
229
+ //userLogo
230
+ let userLogo = get(opt, 'userLogo', '')
231
+
232
+
165
233
  //subfolder
166
234
  let subfolder = get(opt, 'subfolder', '')
167
235
  if (isestr(subfolder)) {
@@ -179,19 +247,14 @@ function WWebSso(WOrm, url, db, getUserByToken, verifyClientUser, verifyAppUser,
179
247
  let language = get(opt, 'language', 'eng')
180
248
  let showModeEditUsers = get(opt, 'showModeEditUsers', 'n')
181
249
  let modeEditUsers = get(opt, 'modeEditUsers', 'n')
250
+ let showModeEditTokens = get(opt, 'showModeEditTokens', 'n')
251
+ let modeEditTokens = get(opt, 'modeEditTokens', 'n')
252
+ let showModeEditIps = get(opt, 'showModeEditIps', 'n')
253
+ let modeEditIps = get(opt, 'modeEditIps', 'n')
182
254
 
183
- //是否可於登入頁提供申請註冊使用者按鈕 bbb
255
+ //是否可於登入頁提供申請註冊使用者按鈕
184
256
  //是否使用圖形驗證碼模組
185
257
 
186
- // - 使用者成功登入後產生token之有效(過期)時間m(30)分鐘
187
- // - 使用者n(10)分鐘內最大登入失敗次數m(3),若觸發則進入封鎖狀態p(30)分鐘
188
- // - 使用者n(10)分鐘內最大調用API次數m(1000),若觸發則進入封鎖狀態p(30)分鐘
189
- // - IP使用者n(10)分鐘內最大調用API次數m(10000),若觸發則IP進入封鎖狀態p(30)分鐘
190
- // - 清除(移動至備份表)紀錄使用者與IP連線log機制,偵測時間n(1)天,保留最新資料時間m(60)天
191
-
192
- //是否啟用要求使用者定期更換密碼
193
- // 若是,預設6個月更換密碼,是否允許使用同樣密碼
194
-
195
258
  //email模板
196
259
  // 註冊驗證信模板
197
260
  // 變更使用者密碼驗證信模板
@@ -229,7 +292,7 @@ function WWebSso(WOrm, url, db, getUserByToken, verifyClientUser, verifyAppUser,
229
292
 
230
293
 
231
294
  //getWebInfor
232
- let getWebInfor = (_t) => {
295
+ let getWebInfor = () => {
233
296
  return {
234
297
 
235
298
  webName,
@@ -237,12 +300,17 @@ function WWebSso(WOrm, url, db, getUserByToken, verifyClientUser, verifyAppUser,
237
300
  webLogo,
238
301
  webBackgoundGradientColors,
239
302
  webKey,
303
+ userLogo,
240
304
 
241
305
  showLanguage,
242
306
  language,
243
307
 
244
308
  showModeEditUsers,
245
309
  modeEditUsers,
310
+ showModeEditTokens,
311
+ modeEditTokens,
312
+ showModeEditIps,
313
+ modeEditIps,
246
314
 
247
315
  kpLangExt,
248
316
 
@@ -250,22 +318,21 @@ function WWebSso(WOrm, url, db, getUserByToken, verifyClientUser, verifyAppUser,
250
318
  }
251
319
 
252
320
 
253
- //procCore
254
- let p = procCore(woItems, procOrm, { salt, timeExpired })
255
-
256
-
257
- //detect
258
- let stCleanTokens = 'none'
259
- setInterval(() => {
260
- if (stCleanTokens === 'doing') {
261
- return
262
- }
263
- stCleanTokens = 'doing'
264
- p.cleanTokens()
265
- .finally(() => {
266
- stCleanTokens = 'none'
267
- })
268
- }, 1000)
321
+ //procCore, procProtect, procStaInfor
322
+ let p = procCore(woItems, procOrm, { salt, minExpired })
323
+ let pp = procProtect(woItems, p, {
324
+ minForAccountLoginFailed,
325
+ numForAccountLoginFailed,
326
+ minBlockForAccountLoginFailed,
327
+ minForTokenCallApi,
328
+ numForTokenCallApi,
329
+ minBlockForTokenCallApi,
330
+ minForIpCallApi,
331
+ numForIpCallApi,
332
+ minBlockForIpCallApi,
333
+ })
334
+ let pf = procStaInfor(woItems, p, {
335
+ })
269
336
 
270
337
 
271
338
  // //parseToken
@@ -504,6 +571,20 @@ function WWebSso(WOrm, url, db, getUserByToken, verifyClientUser, verifyAppUser,
504
571
  // }
505
572
 
506
573
 
574
+ //funCheckAdmin
575
+ let funCheckAdmin = (tk, u) => {
576
+ // console.log('tk', tk, 'u', u)
577
+ let b1 = s.getIsVerified(u)
578
+ let b2 = !s.getIsExpired(u) //不能過期
579
+ let b3 = !s.getIsBlocked(u) //不能封鎖中
580
+ let b4 = s.getIsAdmin(u)
581
+ let b5 = s.getIsActive(u)
582
+ let b = b1 && b2 && b3 && b4 && b5
583
+ // console.log('fun', 'tk', tk, 'u', u, b)
584
+ return b
585
+ }
586
+
587
+
507
588
  //pathStaticFiles
508
589
  let pathStaticFiles = 'dist'
509
590
  let npmPathStaticFiles = './node_modules/w-web-sso/dist'
@@ -552,14 +633,6 @@ function WWebSso(WOrm, url, db, getUserByToken, verifyClientUser, verifyAppUser,
552
633
  // },
553
634
  // },
554
635
 
555
- // {
556
- // method: 'GET',
557
- // path: '/getWebInfor',
558
- // handler: async function (req, res) {
559
- // return getWebInfor() //bbb 應該已不用, 前端載入通訊器後由$fapi.getWebInfor呼叫
560
- // },
561
- // },
562
-
563
636
  {
564
637
  method: 'GET',
565
638
  path: '/api/logoutSsoUser',
@@ -572,8 +645,11 @@ function WWebSso(WOrm, url, db, getUserByToken, verifyClientUser, verifyAppUser,
572
645
  let token = get(req, 'query.token', '')
573
646
  // console.log('token', token)
574
647
 
575
- //logOutByToken
576
- let b = await p.logOutByToken(token)
648
+ //info
649
+ srlog.info({ event: 'api/logoutSsoUser', token })
650
+
651
+ //logoutByToken
652
+ let b = await p.logoutByToken(token)
577
653
  // console.log('b', b)
578
654
 
579
655
  return b
@@ -581,6 +657,9 @@ function WWebSso(WOrm, url, db, getUserByToken, verifyClientUser, verifyAppUser,
581
657
 
582
658
  //pm2resolve core
583
659
  let r = await pm2resolve(core)()
660
+ if (isErr(r.msg)) {
661
+ r.msg = r.msg.message
662
+ }
584
663
  // console.log('logoutSsoUser', r)
585
664
 
586
665
  return r
@@ -599,6 +678,12 @@ function WWebSso(WOrm, url, db, getUserByToken, verifyClientUser, verifyAppUser,
599
678
  let token = get(req, 'query.token', '')
600
679
  // console.log('token', token)
601
680
 
681
+ //info
682
+ srlog.info({ event: 'api/checkToken', token })
683
+
684
+ //callApiByToken
685
+ pp.callApiByToken(token)
686
+
602
687
  //checkToken
603
688
  let b = await p.checkToken(token)
604
689
  // console.log('b', b)
@@ -608,12 +693,87 @@ function WWebSso(WOrm, url, db, getUserByToken, verifyClientUser, verifyAppUser,
608
693
 
609
694
  //pm2resolve core
610
695
  let r = await pm2resolve(core)()
696
+ if (isErr(r.msg)) {
697
+ r.msg = r.msg.message
698
+ }
611
699
  // console.log('checkToken', r)
612
700
 
613
701
  return r
614
702
  },
615
703
  },
616
704
 
705
+ {
706
+ method: 'GET',
707
+ path: '/api/refreshToken',
708
+ handler: async function (req, res) {
709
+ // console.log('refreshToken', req)
710
+
711
+ async function core() {
712
+
713
+ //token
714
+ let token = get(req, 'query.token', '')
715
+ // console.log('token', token)
716
+
717
+ //info
718
+ srlog.info({ event: 'api/refreshToken', token })
719
+
720
+ //callApiByToken
721
+ pp.callApiByToken(token)
722
+
723
+ //refreshToken
724
+ let b = await p.refreshToken(token)
725
+ // console.log('b', b)
726
+
727
+ return b
728
+ }
729
+
730
+ //pm2resolve core
731
+ let r = await pm2resolve(core)()
732
+ if (isErr(r.msg)) {
733
+ r.msg = r.msg.message
734
+ }
735
+ // console.log('refreshToken', r)
736
+
737
+ return r
738
+ },
739
+ },
740
+
741
+ {
742
+ method: 'GET',
743
+ path: '/api/logoutByToken',
744
+ handler: async function (req, res) {
745
+ // console.log('logoutByToken', req)
746
+
747
+ async function core() {
748
+
749
+ //token
750
+ let token = get(req, 'query.token', '')
751
+ // console.log('token', token)
752
+
753
+ //info
754
+ srlog.info({ event: 'api/logoutByToken', token })
755
+
756
+ //callApiByToken
757
+ pp.callApiByToken(token)
758
+
759
+ //logoutByToken
760
+ let b = await p.logoutByToken(token)
761
+ // console.log('b', b)
762
+
763
+ return b
764
+ }
765
+
766
+ //pm2resolve core
767
+ let r = await pm2resolve(core)()
768
+ if (isErr(r.msg)) {
769
+ r.msg = r.msg.message
770
+ }
771
+ // console.log('logoutByToken', r)
772
+
773
+ return r
774
+ },
775
+ },
776
+
617
777
  {
618
778
  method: 'GET',
619
779
  path: '/api/getSsoUsersList',
@@ -626,8 +786,14 @@ function WWebSso(WOrm, url, db, getUserByToken, verifyClientUser, verifyAppUser,
626
786
  let token = get(req, 'query.token', '')
627
787
  // console.log('token', token)
628
788
 
629
- //getUsersList
630
- let us = await p.getUsersList(token)
789
+ //info
790
+ srlog.info({ event: 'api/getSsoUsersList', token })
791
+
792
+ //callApiByToken
793
+ pp.callApiByToken(token)
794
+
795
+ //checkTokenAndGetUsersList
796
+ let us = await p.checkTokenAndGetUsersList(token)
631
797
  // console.log('us', us)
632
798
 
633
799
  return us
@@ -635,6 +801,9 @@ function WWebSso(WOrm, url, db, getUserByToken, verifyClientUser, verifyAppUser,
635
801
 
636
802
  //pm2resolve core
637
803
  let r = await pm2resolve(core)()
804
+ if (isErr(r.msg)) {
805
+ r.msg = r.msg.message
806
+ }
638
807
  // console.log('getSsoUsersList', r)
639
808
 
640
809
  return r
@@ -661,15 +830,21 @@ function WWebSso(WOrm, url, db, getUserByToken, verifyClientUser, verifyAppUser,
661
830
  let value = get(req, 'query.value', '')
662
831
  // console.log('value', value)
663
832
 
833
+ //info
834
+ srlog.info({ event: 'api/getSsoUserInfor', token, key, value })
835
+
836
+ //callApiByToken
837
+ pp.callApiByToken(token)
838
+
664
839
  //userTarget
665
840
  let userTarget = null
666
841
  if (key === 'token') {
667
- userTarget = await p.getUserByToken(value)
668
- // console.log('getUserByToken userTarget', userTarget)
842
+ userTarget = await p.checkTokenAndGetUserByToken(token, value)
843
+ // console.log('checkTokenAndGetUserByToken userTarget', userTarget)
669
844
  }
670
845
  else {
671
- userTarget = await p.getUserInfor(token, key, value)
672
- // console.log('getUserInfor userTarget', userTarget)
846
+ userTarget = await p.checkTokenAndGetUserInfor(token, key, value)
847
+ // console.log('checkTokenAndGetUserInfor userTarget', userTarget)
673
848
  }
674
849
 
675
850
  //check
@@ -685,6 +860,9 @@ function WWebSso(WOrm, url, db, getUserByToken, verifyClientUser, verifyAppUser,
685
860
 
686
861
  //pm2resolve core
687
862
  let r = await pm2resolve(core)()
863
+ if (isErr(r.msg)) {
864
+ r.msg = r.msg.message
865
+ }
688
866
  // console.log('getSsoUserInfor', r)
689
867
 
690
868
  return r
@@ -694,24 +872,65 @@ function WWebSso(WOrm, url, db, getUserByToken, verifyClientUser, verifyAppUser,
694
872
  ]
695
873
 
696
874
 
697
- // //tableNamesExec, tableNamesSync
698
- // let tableNamesExec = [] //keys(ds)
699
- // // let tableNamesSync = filter(tableNamesExec, (v) => {
700
- // // return strright(v, 5) !== 'Items'//不同步數據
701
- // // })
702
- // let tableNamesSync = []
703
-
704
-
705
875
  //WServHapiServer
706
876
  instWServHapiServer = new WServHapiServer({
707
877
  port: opt.serverPort,
708
878
  pathStaticFiles,
879
+ apiName: 'api',
709
880
  apis,
710
- verifyConn: () => {
711
- return true
881
+ tokenType: 'Bearer',
882
+ verifyConn: async ({ apiType, authorization, headers, query }) => {
883
+ // console.log('headers', headers)
884
+
885
+ //getIpByHeaders
886
+ let ip = pp.getIpByHeaders(headers)
887
+ // console.log('ip', ip)
888
+
889
+ //origin
890
+ let origin = get(headers, 'origin', '')
891
+
892
+ //referer
893
+ let referer = get(headers, 'referer', '')
894
+
895
+ //info
896
+ srlog.info({ event: 'verifyConn', ip, origin, referer })
897
+
898
+ //callApiByIp
899
+ pp.callApiByIp(ip)
900
+
901
+ //getBlockedByIp
902
+ let b = true
903
+ await pp.getBlockedByIp(ip)
904
+ .then((res) => {
905
+ // console.log('pp.getBlockedByIp(ip) then', res)
906
+ b = res
907
+ })
908
+ .catch(() => {
909
+ // console.log('pp.getBlockedByIp(ip) catch', err)
910
+ b = true
911
+ })
912
+ // console.log('pp.getBlockedByIp(ip)', b)
913
+
914
+ //b改為代表通行(未封鎖)狀態
915
+ b = !b
916
+
917
+ // //getInforsByIpCallApi
918
+ // let rs = await pp.getInforsByIpCallApi(ip)
919
+ // console.log('getInforsByIpCallApi', [
920
+ // rs[0],
921
+ // rs[rs.length - 1],
922
+ // ], rs.length)
923
+
924
+ //logshow
925
+ if (!b) {
926
+ console.log(`block ip[${ip}]`) //[tag:測試:顯示被封鎖ip]
927
+ }
928
+ // b = true //強制通行
929
+
930
+ return b
712
931
  },
713
932
  getUserIdByToken: async (token) => { //可使用async或sync函數
714
- return ''
933
+ return '' //不檢核, 查找與變更數據皆由kpFunExt內各函數各自檢核
715
934
  },
716
935
  corsOrigins: ['*'],
717
936
  useDbOrm: false,
@@ -721,43 +940,173 @@ function WWebSso(WOrm, url, db, getUserByToken, verifyClientUser, verifyAppUser,
721
940
  methodsExec: [], //['select', 'insert', 'save', 'del', 'delAll'],
722
941
  tableNamesSync: [],
723
942
  kpFunExt: { //接收參數第1個為userId, 之後才是前端給予參數
724
- getWebInfor,
725
- getUserByToken: (_t, token) => {
726
- return p.getUserByToken(token)
943
+
944
+ getWebInfor: async (_t) => {
945
+ return getWebInfor()
727
946
  },
728
- loginByAccountAndPassword: (_t, account, password) => {
729
- return p.loginByAccountAndPassword(account, password)
947
+
948
+ checkToken: async(_t, token) => { //sso前端通過$fapi.checkToken調用
949
+ srlog.info({ event: 'kpfun-checkToken', token })
950
+ let r = await p.checkToken(token)
951
+ return r
730
952
  },
731
- checkToken: (_t, token) => {
732
- return p.checkToken(token)
953
+ refreshToken: async(_t, token) => { //sso前端通過$fapi.refreshToken調用
954
+ srlog.info({ event: 'kpfun-refreshToken', token })
955
+ let r = await p.refreshToken(token)
956
+ return r
733
957
  },
734
- refreshToken: (_t, token) => {
735
- return p.refreshToken(token)
958
+ loginByAccountAndPassword: async (_t, account, password) => {
959
+
960
+ //info, 使用者登入前
961
+ srlog.info({ event: 'kpfun-loginByAccountAndPassword-before', account })
962
+
963
+ let u = null
964
+ let msg = ''
965
+ await pp.loginByAccountAndPassword(account, password) //記得不能使用p.loginByAccountAndPassword, 此未提供保護機制
966
+ .then((res) => {
967
+ u = res
968
+ })
969
+ .catch((err) => {
970
+ msg = err
971
+ })
972
+
973
+ //info, 使用者登入成功或失敗
974
+ if (iseobj(u)) {
975
+ srlog.info({ event: 'kpfun-loginByAccountAndPassword-success', account })
976
+ }
977
+ else {
978
+ srlog.info({ event: 'kpfun-loginByAccountAndPassword-error', account, msg })
979
+ }
980
+
981
+ if (iseobj(u)) {
982
+ return u
983
+ }
984
+ return Promise.reject(msg)
736
985
  },
737
- logOutByToken: (_t, token) => {
738
- return p.logOutByToken(token)
986
+ logoutByToken: async (_t, token) => {
987
+ srlog.info({ event: 'kpfun-logoutByToken', token })
988
+ let r = await p.logoutByToken(token)
989
+ return r
739
990
  },
740
- getUsersList: (_t, token) => {
741
- return p.getUsersList(token)
991
+ getUserByToken: async (_t, token) => {
992
+ srlog.info({ event: 'kpfun-getUserByToken', token })
993
+ //console.log('call getUserByToken...')
994
+ let r = await p.checkTokenAndGetUserByToken(token, token)
995
+ //console.log('call getUserByToken end')
996
+ return r
742
997
  },
743
- updateUsersList: (_t, token, rows) => {
744
- return p.updateUsersList(token, rows)
998
+ getUserInfor: async (_t, token, key, value) => {
999
+ srlog.info({ event: 'kpfun-getUserInfor', token, key, value })
1000
+ //console.log('call getUserInfor...')
1001
+ let r = await p.checkTokenAndGetUserInfor(token, key, value)
1002
+ //console.log('call getUserInfor end')
1003
+ return r
745
1004
  },
746
- getSettings: async (_t, token,) => {
747
1005
 
748
- //checkToken
749
- await p.checkToken(token)
1006
+ getUsersList: async (_t, token) => {
1007
+ srlog.info({ event: 'kpfun-getUsersList', token })
1008
+ //console.log('call getUsersList...')
1009
+ let rs = await p.checkTokenAndGetUsersList(token, { fun: funCheckAdmin })
1010
+ //console.log('call getUsersList end')
1011
+ return rs
1012
+ },
1013
+ updateUsersList: async (_t, token, rows) => {
1014
+ srlog.info({ event: 'kpfun-updateUsersList', token })
1015
+ //console.log('call updateUsersList...')
1016
+ let rs = await p.checkTokenAndUpdateUsersList(token, rows, { fun: funCheckAdmin })
1017
+ //console.log('call updateUsersList end')
1018
+ return rs
1019
+ },
750
1020
 
751
- return procSettings.getSettings()
1021
+ getTokensList: async (_t, token) => {
1022
+ srlog.info({ event: 'kpfun-getTokensList', token })
1023
+ //console.log('call getTokensList...')
1024
+ let rs = await p.checkTokenAndGetTokensList(token, { fun: funCheckAdmin })
1025
+ //console.log('call getTokensList end')
1026
+ return rs
1027
+ },
1028
+ updateTokensList: async (_t, token, rows) => {
1029
+ srlog.info({ event: 'kpfun-updateTokensList', token })
1030
+ //console.log('call updateTokensList...')
1031
+ let rs = await p.checkTokenAndUpdateTokensList(token, rows, { fun: funCheckAdmin })
1032
+ //console.log('call updateTokensList end')
1033
+ return rs
752
1034
  },
753
- updateSettings: async (_t, token, st) => {
754
1035
 
755
- //checkToken
756
- await p.checkToken(token)
1036
+ getIpsList: async (_t, token) => {
1037
+ srlog.info({ event: 'kpfun-getIpsList', token })
1038
+ //console.log('call getIpsList...')
1039
+ let rs = await p.checkTokenAndGetIpsList(token, { fun: funCheckAdmin })
1040
+ //console.log('call getIpsList end')
1041
+ return rs
1042
+ },
1043
+ updateIpsList: async (_t, token, rows) => {
1044
+ srlog.info({ event: 'kpfun-updateIpsList', token })
1045
+ //console.log('call updateIpsList...')
1046
+ let rs = await p.checkTokenAndUpdateIpsList(token, rows, { fun: funCheckAdmin })
1047
+ //console.log('call updateIpsList end')
1048
+ return rs
1049
+ },
1050
+
1051
+ getStaUserSummary: async (_t, token) => {
1052
+ srlog.info({ event: 'kpfun-getStaUserSummary', token })
1053
+ //console.log('call getStaUserSummary...')
1054
+ let r = await pf.getStaUserSummary(token, { fun: funCheckAdmin })
1055
+ //console.log('call getStaUserSummary end')
1056
+ return r
1057
+ },
1058
+ getStaTokenSummary: async (_t, token) => {
1059
+ srlog.info({ event: 'kpfun-getStaTokenSummary', token })
1060
+ //console.log('call getStaTokenSummary...')
1061
+ let r = await pf.getStaTokenSummary(token, { fun: funCheckAdmin })
1062
+ //console.log('call getStaTokenSummary end')
1063
+ return r
1064
+ },
1065
+ getStaIpSummary: async (_t, token) => {
1066
+ srlog.info({ event: 'kpfun-getStaIpSummary', token })
1067
+ //console.log('call getStaIpSummary...')
1068
+ let r = await pf.getStaIpSummary(token, { fun: funCheckAdmin })
1069
+ //console.log('call getStaIpSummary end')
1070
+ return r
1071
+ },
757
1072
 
758
- return procSettings.setSettings(st)
1073
+ getStaUserAccountLogin: async (_t, token) => {
1074
+ srlog.info({ event: 'kpfun-getStaUserAccountLogin', token })
1075
+ //console.log('call getStaUserAccountLogin...')
1076
+ let r = await pf.checkTokenAndGetStaUserAccountLogin(token, { fun: funCheckAdmin })
1077
+ //console.log('call getStaUserAccountLogin end')
1078
+ return r
759
1079
  },
760
- //...
1080
+ getStaToken: async (_t, token) => {
1081
+ srlog.info({ event: 'kpfun-getStaToken', token })
1082
+ //console.log('call getStaToken...')
1083
+ let r = await pf.checkTokenAndGetStaToken(token, { fun: funCheckAdmin })
1084
+ //console.log('call getStaToken end')
1085
+ return r
1086
+ },
1087
+ getStaIp: async (_t, token) => {
1088
+ srlog.info({ event: 'kpfun-getStaIp', token })
1089
+ //console.log('call getStaIp...')
1090
+ let r = await pf.checkTokenAndGetStaIp(token, { fun: funCheckAdmin })
1091
+ //console.log('call getStaIp end')
1092
+ return r
1093
+ },
1094
+
1095
+ // getSettings: async (_t, token) => {
1096
+
1097
+ // //checkToken
1098
+ // await p.checkToken(token)
1099
+
1100
+ // return procSettings.getSettings()
1101
+ // },
1102
+ // updateSettings: async (_t, token, st) => {
1103
+
1104
+ // //checkToken
1105
+ // await p.checkToken(token)
1106
+
1107
+ // return procSettings.setSettings(st)
1108
+ // },
1109
+
761
1110
  },
762
1111
  fnTableTags: 'tableTags-web-sso.json',
763
1112
  })