n20-common-lib 2.4.0 → 2.4.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n20-common-lib",
-  "version": "2.4.0",
+  "version": "2.4.1",
   "private": false,
   "main": "src/index.js",
   "scripts": {

package/src/plugins/Sign/sign.js

@@ -1,141 +1,128 @@
-// Attached方式签名
-import { IWSAgent } from './InfosecNetSignCNGAgent.min.js'
-import { Message, Notification } from 'element-ui'
-const {
-  IWSASetTimeOut,
-  IWSAAttachedSign,
-  IWSAAttachedVerify,
-  IWSASendAvailable,
-  IWSAGetAvailable,
-  IWSAGetAllCertsListInfoByCertDN
-} = new IWSAgent()
-IWSASetTimeOut(6000)
-
-function getDN() {
-  let dn
-  let userInfo = JSON.parse(sessionStorage.getItem('userInfo'))
-  if (userInfo && userInfo.dn) {
-    dn = userInfo.dn
-  }
-  return dn
-}
-
-/* 检测本地签名端口是否可用 */
-export function availableSign(fn, url) {
-  url || (url = '/portal/NetSignCNG-v2.1.152.2.exe')
-  // 查找已经打开的签名端口
-  let available = IWSAGetAvailable()
-  if (available) {
-    fn && fn(available)
-  } else {
-    // 如果没有,再刺探一遍 (异步请求,需等待)
-    IWSASendAvailable()
-    setTimeout(() => {
-      available = IWSAGetAvailable()
-      fn && fn(available)
-
-      if (!available) {
-        Notification({
-          title: '提示',
-          dangerouslyUseHTMLString: true,
-          message: `<div>检测到您的电脑中没有安装签名助手，为了不影响使用请使用管理员权限<a class="color-primary" href="${url}" download>下载安装</a>NetSignCNG签名助手</div>`,
-          duration: 5000
-        })
-      }
-    }, 300)
-  }
-}
-
-/* 签名解签 */
-export function verifySign(signedMsg) {
-  let plainText
-  IWSAAttachedVerify('1', signedMsg, (errorCode, PlainText, SigncertDN) => {
-    if (errorCode === 0 || errorCode === '0') {
-      plainText = PlainText
-    } else {
-      Message.error('签名解签失败!')
-    }
-  })
-  return plainText
-}
-
-/* 给对象或字符串签名 */
-export function getSign(plain, dn) {
-  if (dn === undefined) {
-    dn = getDN()
-  }
-  if (!dn) {
-    Message.error('签名参数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) {
-    switch (checkRes) {
-      case 'dnListEmpty':
-        Message.warning('没有匹配到证书!')
-        break
-      case 'dnIsEmpty':
-        Message.warning('DN参数为空!')
-        break
-      case 'Empty':
-        Message.warning('当前Ukey不匹配!')
-        break
-      default:
-        Message.warning('没有匹配到证书!')
-    }
-    return ''
-  }
-
-  let answer = undefined
-  IWSAAttachedSign('1', plainText, '0', 'SHA1', (errorCode, signedData) => {
-    if (errorCode === 0 || errorCode === '0') {
-      answer = signedData
-    } else {
-      Message.error('签名失败!')
-    }
-  })
-  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.length === 0) return 'dnListEmpty'
-  if (!dnList) return 'Empty'
-  if (!dn) return 'dnIsEmpty'
-
-  let checkRes = ''
-  let userDnAttrsArr = dn.split(',').map((c) => c.trim())
-
-  let isIn = false
-  dnList.find((C) => {
-    let dnAttrsArr = C.certDN.split(',').map((c) => c.trim())
-    if (dnAttrsArr.every((dnAttr) => userDnAttrsArr.includes(dnAttr))) {
-      return (isIn = true)
-    }
-  })
-  if (!isIn) {
-    checkRes = 'checkRes'
-  }
-
-  return checkRes
-}
+// Attached方式签名
+import { IWSAgent } from './InfosecNetSignCNGAgent.min.js'
+import { Message, Notification } from 'element-ui'
+const {
+  IWSASetTimeOut,
+  IWSAAttachedSign,
+  IWSAAttachedVerify,
+  IWSASendAvailable,
+  IWSAGetAvailable,
+  IWSAGetAllCertsListInfoByCertDN
+} = new IWSAgent()
+IWSASetTimeOut(6000)
+
+function getDN() {
+  let dn
+  let userInfo = JSON.parse(sessionStorage.getItem('userInfo'))
+  if (userInfo && userInfo.dn) {
+    dn = userInfo.dn
+  }
+  return dn
+}
+
+/* 检测本地签名端口是否可用 */
+export function availableSign(fn, url) {
+  url || (url = '/portal/NetSignCNG-v2.1.152.2.exe')
+  // 查找已经打开的签名端口
+  let available = IWSAGetAvailable()
+  if (available) {
+    fn && fn(available)
+  } else {
+    // 如果没有,再刺探一遍 (异步请求,需等待)
+    IWSASendAvailable()
+    setTimeout(() => {
+      available = IWSAGetAvailable()
+      fn && fn(available)
+
+      if (!available) {
+        Notification({
+          title: '提示',
+          dangerouslyUseHTMLString: true,
+          message: `<div>检测到您的电脑中没有安装签名助手，为了不影响使用请使用管理员权限<a class="color-primary" href="${url}" download>下载安装</a>NetSignCNG签名助手</div>`,
+          duration: 5000
+        })
+      }
+    }, 300)
+  }
+}
+
+/* 签名解签 */
+export function verifySign(signedMsg) {
+  let plainText
+  IWSAAttachedVerify('1', signedMsg, (errorCode, PlainText, SigncertDN) => {
+    if (errorCode === 0 || errorCode === '0') {
+      plainText = PlainText
+    } else {
+      Message.error('签名解签失败!')
+    }
+  })
+  return plainText
+}
+
+/* 给对象或字符串签名 */
+export function getSign(plain, dn) {
+  if (dn === undefined) {
+    dn = getDN()
+  }
+  if (!dn) {
+    Message.error('签名参数DN错误!')
+    return false
+  }
+  let plainText = ''
+  if (typeof plain === 'object') {
+    plainText = JSON.stringify(plain)
+  } else {
+    plainText = plain
+  }
+
+  let index
+  IWSAGetAllCertsListInfoByCertDN('', 'Sign', parseCA(dn), 0, (dnList) => {
+    index = verifyDn(dnList, dn)
+  })
+  if(index==-1){
+    Message.warning('没有匹配到证书!')
+    return ''
+  }
+  let answer = undefined
+  IWSAAttachedSign('1', plainText, index, 'SHA1', (errorCode, signedData) => {
+    if (errorCode === 0 || errorCode === '0') {
+      answer = signedData
+    } else {
+      Message.error('签名失败!')
+    }
+  })
+  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.length === 0) return 'dnListEmpty'
+  if (!dnList) return 'Empty'
+  if (!dn) return 'dnIsEmpty'
+
+  let userDnAttrsArr = dn.split(',').map((c) => c.trim())
+
+  let isIn = false
+  let index=0;
+  dnList.find((C,i) => {
+    let dnAttrsArr = C.certDN.split(',').map((c) => c.trim())
+    if (dnAttrsArr.every((dnAttr) => userDnAttrsArr.includes(dnAttr))) {
+      index = i;
+      return (isIn = true)
+    }
+  })
+  if (!isIn) {
+    index = -1
+  }
+  return index
+}