n20-common-lib 1.3.46 → 1.3.49

package/src/plugins/Sign/bjca/index.js

@@ -1,129 +1,129 @@
-import './XTXSAB.js'
-import { Message } from 'element-ui'
-let _dn
-function getDN() {
-  if (!_dn) {
-    let userInfo = JSON.parse(sessionStorage.getItem('userInfo'))
-    if (userInfo?.dn) {
-      _dn = userInfo.dn
-    }
-  }
-  return _dn
-}
-
-/* 给对象或字符串签名 */
-export async function getSign(plain, dn) {
-  let errMsg
-  let plainText
-  await new Promise((resolve, reject) => {
-    window._bjca_init_(
-      () => resolve(),
-      () => {
-        errMsg = '没有检测到签名驱动!'
-        Message.error(errMsg)
-        reject(errMsg)
-      }
-    )
-  })
-
-  if (dn === undefined) {
-    dn = getDN()
-  }
-  if (!dn) {
-    errMsg = '签名参数DN错误!'
-    Message.error(errMsg)
-    return Promise.reject(errMsg)
-  }
-
-  if (typeof plain === 'object') {
-    plainText = JSON.stringify(plain)
-  } else {
-    plainText = plain
-  }
-
-  /**
-   * 获取证书列表
-   */
-  let CertIdList = []
-  await new Promise((resolve, reject) => {
-    window.SOF_GetUserList((l) => {
-      if (l.retVal) {
-        CertIdList = l.retVal
-          .replace(/&&&$/, '')
-          .split('&&&')
-          .map((s) => s.split('||')[1])
-        resolve()
-      } else {
-        Message.error('证书获取失败')
-        resolve()
-      }
-    })
-  })
-
-  /**
-   * 获取证书
-   */
-
-  let r_retVal = []
-  await new Promise((resolve, reject) => {
-    for (let i = 0; i < CertIdList.length; i++) {
-      const item = CertIdList[i]
-      window.SOF_ExportUserCert(item, (r) => {
-        if (r.retVal) {
-          r_retVal.push({ certId: CertIdList[i], retVal: r.retVal })
-          resolve()
-        } else {
-          errMsg = '证书获取失败!'
-          Message.error(errMsg)
-          reject(errMsg)
-        }
-      })
-    }
-  })
-
-  /**
-   * 根据OID获取证书信息
-   */
-  let s_retVal = []
-  await new Promise((resolve, reject) => {
-    for (let i = 0; i < r_retVal.length; i++) {
-      const val = r_retVal[i].retVal
-      window.SOF_GetCertInfoByOid(val, '1.2.156.112562.2.1.1.23', (s) => {
-        if (s.retVal) {
-          s_retVal.push({ certId: r_retVal[i].certId, retVal: s.retVal })
-          resolve()
-        } else {
-          errMsg = '证书信息获取失败!'
-          Message.error(errMsg)
-          reject(errMsg)
-        }
-      })
-    }
-  })
-
-  /**
-   * 签名
-   */
-  let v_retVal, cert
-  let val = s_retVal.filter((v) => v.retVal === dn)
-  if (val.length > 0) {
-    cert = r_retVal.filter((s) => s.certId === val[0].certId)
-    await new Promise((resolve, reject) => {
-      window.SOF_SignData(val[0].certId, plainText, (v) => {
-        if (v.retVal) {
-          v_retVal = v.retVal
-          resolve()
-        } else {
-          errMsg = '签名失败!'
-          Message.error(errMsg)
-          reject(errMsg)
-        }
-      })
-    })
-    return Promise.resolve(v_retVal + '@@@' + cert[0].retVal)
-  } else {
-    errMsg = '参数dn信息不批匹配！'
-    Message.error(errMsg)
-    return Promise.reject(errMsg)
-  }
-}
+import './XTXSAB.js'
+import { Message } from 'element-ui'
+let _dn
+function getDN() {
+  if (!_dn) {
+    let userInfo = JSON.parse(sessionStorage.getItem('userInfo'))
+    if (userInfo?.dn) {
+      _dn = userInfo.dn
+    }
+  }
+  return _dn
+}
+
+/* 给对象或字符串签名 */
+export async function getSign(plain, dn) {
+  let errMsg
+  let plainText
+  await new Promise((resolve, reject) => {
+    window._bjca_init_(
+      () => resolve(),
+      () => {
+        errMsg = '没有检测到签名驱动!'
+        Message.error(errMsg)
+        reject(errMsg)
+      }
+    )
+  })
+
+  if (dn === undefined) {
+    dn = getDN()
+  }
+  if (!dn) {
+    errMsg = '签名参数DN错误!'
+    Message.error(errMsg)
+    return Promise.reject(errMsg)
+  }
+
+  if (typeof plain === 'object') {
+    plainText = JSON.stringify(plain)
+  } else {
+    plainText = plain
+  }
+
+  /**
+   * 获取证书列表
+   */
+  let CertIdList = []
+  await new Promise((resolve, reject) => {
+    window.SOF_GetUserList((l) => {
+      if (l.retVal) {
+        CertIdList = l.retVal
+          .replace(/&&&$/, '')
+          .split('&&&')
+          .map((s) => s.split('||')[1])
+        resolve()
+      } else {
+        Message.error('证书获取失败')
+        resolve()
+      }
+    })
+  })
+
+  /**
+   * 获取证书
+   */
+
+  let r_retVal = []
+  await new Promise((resolve, reject) => {
+    for (let i = 0; i < CertIdList.length; i++) {
+      const item = CertIdList[i]
+      window.SOF_ExportUserCert(item, (r) => {
+        if (r.retVal) {
+          r_retVal.push({ certId: CertIdList[i], retVal: r.retVal })
+          resolve()
+        } else {
+          errMsg = '证书获取失败!'
+          Message.error(errMsg)
+          reject(errMsg)
+        }
+      })
+    }
+  })
+
+  /**
+   * 根据OID获取证书信息
+   */
+  let s_retVal = []
+  await new Promise((resolve, reject) => {
+    for (let i = 0; i < r_retVal.length; i++) {
+      const val = r_retVal[i].retVal
+      window.SOF_GetCertInfoByOid(val, '1.2.156.112562.2.1.1.23', (s) => {
+        if (s.retVal) {
+          s_retVal.push({ certId: r_retVal[i].certId, retVal: s.retVal })
+          resolve()
+        } else {
+          errMsg = '证书信息获取失败!'
+          Message.error(errMsg)
+          reject(errMsg)
+        }
+      })
+    }
+  })
+
+  /**
+   * 签名
+   */
+  let v_retVal, cert
+  let val = s_retVal.filter((v) => v.retVal === dn)
+  if (val.length > 0) {
+    cert = r_retVal.filter((s) => s.certId === val[0].certId)
+    await new Promise((resolve, reject) => {
+      window.SOF_SignData(val[0].certId, plainText, (v) => {
+        if (v.retVal) {
+          v_retVal = v.retVal
+          resolve()
+        } else {
+          errMsg = '签名失败!'
+          Message.error(errMsg)
+          reject(errMsg)
+        }
+      })
+    })
+    return Promise.resolve(v_retVal + '@@@' + cert[0].retVal)
+  } else {
+    errMsg = '参数dn信息不批匹配！'
+    Message.error(errMsg)
+    return Promise.reject(errMsg)
+  }
+}

package/src/plugins/Sign/index.js

@@ -1,28 +1,28 @@
-export async function getSign(p1, p2, p3) {
-  let signType = window.sessionStorage.getItem('signType')
-  let CaMap = {
-    inetSign: '信安CA',
-    bjcaSign: '北京CA'
-  }
-  if (!signType || !CaMap[signType]) {
-    console.error('请设置签名服务公司sessionStorage.signType,公司字段映射:', CaMap)
-    signType = 'inetSign'
-  }
-  const por = new Promise((resolve) => {
-    if (signType === 'inetSign' /* 信安CA */) {
-      import('./sign.js').then(({ getSign }) => {
-        const sign = getSign(p1, p2, p3)
-        resolve(sign)
-      })
-    } else if (signType === 'bjcaSign' /* 北京CA */) {
-      import('./bjca/index.js').then(({ getSign }) => {
-        getSign(p1, p2, p3).then((sign) => {
-          resolve(sign)
-        })
-      })
-    }
-  })
-  return por
-}
-
-export { availableSign, verifySign } from './sign.js'
+export async function getSign(p1, p2, p3) {
+  let signType = window.sessionStorage.getItem('signType')
+  let CaMap = {
+    inetSign: '信安CA',
+    bjcaSign: '北京CA'
+  }
+  if (!signType || !CaMap[signType]) {
+    console.error('请设置签名服务公司sessionStorage.signType,公司字段映射:', CaMap)
+    signType = 'inetSign'
+  }
+  const por = new Promise((resolve) => {
+    if (signType === 'inetSign' /* 信安CA */) {
+      import('./sign.js').then(({ getSign }) => {
+        const sign = getSign(p1, p2, p3)
+        resolve(sign)
+      })
+    } else if (signType === 'bjcaSign' /* 北京CA */) {
+      import('./bjca/index.js').then(({ getSign }) => {
+        getSign(p1, p2, p3).then((sign) => {
+          resolve(sign)
+        })
+      })
+    }
+  })
+  return por
+}
+
+export { availableSign, verifySign } from './sign.js'

package/src/plugins/Sign/sign.js

@@ -1,64 +1,108 @@
-// Attached方式签名
-import { IWSAgent } from './InfosecNetSignCNGAgent.min.js'
-const { IWSASetTimeOut, IWSAAttachedSign, IWSAAttachedVerify, IWSASendAvailable, IWSAGetAvailable } = new IWSAgent()
-IWSASetTimeOut(6000)
-
-let _dn
-function getDN() {
-  if (!_dn) {
-    let userInfo = JSON.parse(sessionStorage.getItem('userInfo'))
-    if (userInfo?.dn) {
-      _dn = userInfo.dn
-    }
-  }
-  return _dn
-}
-
-/* 检测本地签名端口是否可用 */
-export function availableSign(fn) {
-  IWSASendAvailable() // 异步请求,需等待
-  setTimeout(() => {
-    let available = IWSAGetAvailable()
-    fn && fn(available)
-  }, 300)
-}
-
-/* 签名解签 */
-export function verifySign(signedMsg) {
-  let plainText
-  IWSAAttachedVerify('1', signedMsg, (errorCode, PlainText, SigncertDN) => {
-    if (errorCode === 0 || errorCode === '0') {
-      plainText = PlainText
-    } else {
-      alert('签名解签失败!')
-    }
-  })
-  return plainText
-}
-
-/* 给对象或字符串签名 */
-export function getSign(plain, dn) {
-  if (dn === undefined) {
-    dn = getDN()
-  }
-  if (!dn) {
-    alert('签名参数DN错误!')
-    return false
-  }
-  let plainText = ''
-  if (typeof plain === 'object') {
-    plainText = JSON.stringify(plain)
-  } else {
-    plainText = plain
-  }
-
-  let answer = undefined
-  IWSAAttachedSign('1', plainText, '0', 'SHA1', (errorCode, signedData) => {
-    if (errorCode === 0 || errorCode === '0') {
-      answer = signedData
-    } else {
-      alert('签名失败!')
-    }
-  })
-  return answer
-}
+// Attached方式签名
+import { IWSAgent } from './InfosecNetSignCNGAgent.min.js'
+const {
+  IWSASetTimeOut,
+  IWSAAttachedSign,
+  IWSAAttachedVerify,
+  IWSASendAvailable,
+  IWSAGetAvailable,
+  IWSAGetAllCertsListInfoByCertDN
+} = new IWSAgent()
+IWSASetTimeOut(6000)
+
+let _dn
+function getDN() {
+  if (!_dn) {
+    let userInfo = JSON.parse(sessionStorage.getItem('userInfo'))
+    if (userInfo?.dn) {
+      _dn = userInfo.dn
+    }
+  }
+  return _dn
+}
+
+/* 检测本地签名端口是否可用 */
+export function availableSign(fn) {
+  IWSASendAvailable() // 异步请求,需等待
+  setTimeout(() => {
+    let available = IWSAGetAvailable()
+    fn && fn(available)
+  }, 300)
+}
+
+/* 签名解签 */
+export function verifySign(signedMsg) {
+  let plainText
+  IWSAAttachedVerify('1', signedMsg, (errorCode, PlainText, SigncertDN) => {
+    if (errorCode === 0 || errorCode === '0') {
+      plainText = PlainText
+    } else {
+      alert('签名解签失败!')
+    }
+  })
+  return plainText
+}
+
+/* 给对象或字符串签名 */
+export function getSign(plain, dn) {
+  if (dn === undefined) {
+    dn = getDN()
+  }
+  if (!dn) {
+    alert('签名参数DN错误!')
+    return false
+  }
+  let plainText = ''
+  if (typeof plain === 'object') {
+    plainText = JSON.stringify(plain)
+  } else {
+    plainText = plain
+  }
+
+  let checkRes
+  IWSAGetAllCertsListInfoByCertDN('', 'Sign', parseCA(dn), 0, (dnList) => {
+    checkRes = verifyDn(dnList, dn)
+  })
+  if (checkRes) return ''
+
+  let answer = undefined
+  IWSAAttachedSign('1', plainText, '0', 'SHA1', (errorCode, signedData) => {
+    if (errorCode === 0 || errorCode === '0') {
+      answer = signedData
+    } else {
+      alert('签名失败!')
+    }
+  })
+  return answer
+}
+
+function parseCA(dn) {
+  const mark = /^CN=/
+  let cn = ''
+  if (dn == null) return cn
+
+  let booked = dn.split(',')
+  let dnC = booked.find((b) => mark.test(b))
+  dnC && (cn = dnC.replace(mark, ''))
+  return cn
+}
+
+function verifyDn(dnList, dn) {
+  if (!dnList || dnList.length === 0) return 'dnListEmpty'
+
+  if (!dn) return 'dnIsEmpty'
+
+  let checkRes = ''
+  let userDnAttrsArr = dn.split(',').map((c) => c.trim())
+
+  dnList.find((C) => {
+    let dnAttrsArr = C.certDN.split(',').map((c) => c.trim())
+
+    if (!dnAttrsArr.some((dnAttr) => userDnAttrsArr.includes(dnAttr))) {
+      checkRes = 'checkRes'
+      return true
+    }
+  })
+
+  return checkRes
+}

package/src/plugins/setTabsForSub.js

@@ -1,2 +1,2 @@
-import { setTabsForSub } from './CompatibleOld'
-export default setTabsForSub
+import { setTabsForSub } from './CompatibleOld'
+export default setTabsForSub

package/src/utils/auth.js

@@ -1,56 +1,56 @@
-/* 设置/获取token */
-import Cookies from 'js-cookie'
-
-const STORAGE = window.sessionStorage
-
-const auth = {
-  stokenKey: 'token',
-  cokenKey: 'token',
-  tokenVal: '',
-  getTokenKey() {
-    return this.stokenKey
-  },
-  getToken() {
-    this.tokenVal || (this.tokenVal = STORAGE.getItem(this.stokenKey))
-    return this.tokenVal
-  },
-  getCookieToken() {
-    return Cookies.get(this.cokenKey)
-  },
-  setToken(val) {
-    Cookies.set(this.cokenKey, val, { expires: 1 })
-    STORAGE.setItem(this.stokenKey, val)
-  },
-  removeToken() {
-    this.tokenVal = ''
-    Cookies.remove(this.cokenKey)
-    STORAGE.removeItem(this.stokenKey)
-    toLogin()
-  },
-  setLoginPath(router) {
-    let { base = '/', mode = 'history' } = router.options
-    ;/\/$/.test(base) || (base += '/')
-    if (mode === 'hash') {
-      ownLoginPath = window.location.origin + base + '#/login'
-    } else {
-      ownLoginPath = window.location.origin + base + 'login'
-    }
-    // 判断有没有token,没有直接跳到登录页
-    auth.getToken() || toLogin()
-  }
-}
-auth.cokenKey = 'Admin-Token'
-
-let ownLoginPath = '/login'
-function toLogin() {
-  let hrefOld = window.location.href
-  let loginHref = window.__POWERED_BY_QIANKUN__
-    ? window.location.origin + '/login'
-    : ownLoginPath
-  if (hrefOld !== loginHref) {
-    history.pushState(null, null, loginHref)
-    window.location.reload()
-  }
-}
-
-export default auth
+/* 设置/获取token */
+import Cookies from 'js-cookie'
+
+const STORAGE = window.sessionStorage
+
+const auth = {
+  stokenKey: 'token',
+  cokenKey: 'token',
+  tokenVal: '',
+  getTokenKey() {
+    return this.stokenKey
+  },
+  getToken() {
+    this.tokenVal || (this.tokenVal = STORAGE.getItem(this.stokenKey))
+    return this.tokenVal
+  },
+  getCookieToken() {
+    return Cookies.get(this.cokenKey)
+  },
+  setToken(val) {
+    Cookies.set(this.cokenKey, val, { expires: 1 })
+    STORAGE.setItem(this.stokenKey, val)
+  },
+  removeToken() {
+    this.tokenVal = ''
+    Cookies.remove(this.cokenKey)
+    STORAGE.removeItem(this.stokenKey)
+    toLogin()
+  },
+  setLoginPath(router) {
+    let { base = '/', mode = 'history' } = router.options
+    ;/\/$/.test(base) || (base += '/')
+    if (mode === 'hash') {
+      ownLoginPath = window.location.origin + base + '#/login'
+    } else {
+      ownLoginPath = window.location.origin + base + 'login'
+    }
+    // 判断有没有token,没有直接跳到登录页
+    auth.getToken() || toLogin()
+  }
+}
+auth.cokenKey = 'Admin-Token'
+
+let ownLoginPath = '/login'
+function toLogin() {
+  let hrefOld = window.location.href
+  let loginHref = window.__POWERED_BY_QIANKUN__
+    ? window.location.origin + '/login'
+    : ownLoginPath
+  if (hrefOld !== loginHref) {
+    history.pushState(null, null, loginHref)
+    window.location.reload()
+  }
+}
+
+export default auth