n20-common-lib 3.2.26 → 3.2.27

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n20-common-lib",
-  "version": "3.2.26",
+  "version": "3.2.27",
   "private": false,
   "scripts": {
     "serve": "vue-cli-service serve",

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

@@ -1,6 +1,7 @@
 import { Message, MessageBox, Notification } from 'element-ui'
 import { codeDate } from '../codeMap.js'
 import { IWSAgent } from './InfosecNetSignCNGAgent.min.js'
+import { isDnMatched } from '../dn.js'
 /*
 获取证书列表接口：2.7.1  IWSASkfGetCertList (DllFilePath, SucceedFunction)
 Attached签名接口：2.7.2 IWSASkfSignData (PlainText, CertIndex, UsbKeyPin, DigestArithmetic, SucceedFunction)
@@ -62,17 +63,14 @@ function checkAvailable(fn, url, count) {
 }
 
 function verifyDn(dnList, dn) {
-  if (dnList.length === 0) return 'dnListEmpty'
   if (!dnList) return 'Empty'
+  if (dnList.length === 0) return 'dnListEmpty'
   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))) {
+    if (isDnMatched(C.certDN, dn)) {
       index = i
       return (isIn = true)
     }

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

@@ -1,6 +1,7 @@
 import { Message, MessageBox, Notification } from 'element-ui'
 import { codeDate } from '../codeMap.js'
 import { IWSAgent } from './InfosecNetSignCNGAgent.min.js'
+import { isDnMatched } from '../dn.js'
 /*
 获取证书列表接口：2.7.1  IWSASkfGetCertList (DllFilePath, SucceedFunction)
 Attached签名接口：2.7.2 IWSASkfSignData (PlainText, CertIndex, UsbKeyPin, DigestArithmetic, SucceedFunction)
@@ -62,17 +63,14 @@ function checkAvailable(fn, url, count) {
 }
 
 function verifyDn(dnList, dn) {
-  if (dnList.length === 0) return 'dnListEmpty'
   if (!dnList) return 'Empty'
+  if (dnList.length === 0) return 'dnListEmpty'
   if (!dn) return 'dnIsEmpty'
 
   let checkRes = 0
-  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))) {
+    if (isDnMatched(C.certDN, dn)) {
       return (isIn = true)
     }
   })

package/src/plugins/Sign/dn.js

@@ -0,0 +1,57 @@
+function parseDnAttrs(dn) {
+  if (!dn || typeof dn !== 'string') return []
+  return dn
+    .split(',')
+    .map(item => item.trim())
+    .filter(Boolean)
+    .map(item => {
+      const matched = item.match(/^([^=]+)\s*=\s*(.*)$/)
+      if (!matched) return null
+      return {
+        key: matched[1].trim().toUpperCase(),
+        value: matched[2].trim().replace(/\s+/g, ' ')
+      }
+    })
+    .filter(item => item && item.key && item.value)
+}
+
+function hasAttr(attrs, target) {
+  return attrs.some(
+    item => item.key === target.key && item.value === target.value
+  )
+}
+
+function getCn(attrs) {
+  const cn = attrs.find(item => item.key === 'CN')
+  return cn && cn.value
+}
+
+export function parseCA(dn) {
+  return getCn(parseDnAttrs(dn)) || ''
+}
+
+export function isCertCheckFailed(result) {
+  return (
+    result === -1 ||
+    result === false ||
+    ['dnListEmpty', 'Empty', 'dnIsEmpty'].includes(result)
+  )
+}
+
+export function isDnMatched(certDn, userDn) {
+  if (!certDn || !userDn) return false
+  if (certDn.trim() === userDn.trim()) return true
+
+  const certAttrs = parseDnAttrs(certDn)
+  const userAttrs = parseDnAttrs(userDn)
+  if (!certAttrs.length || !userAttrs.length) return false
+
+  if (userAttrs.every(attr => hasAttr(certAttrs, attr))) return true
+  if (certAttrs.every(attr => hasAttr(userAttrs, attr))) return true
+
+  if (certAttrs.length > 1 && userAttrs.length > 1) return false
+
+  const certCn = getCn(certAttrs)
+  const userCn = getCn(userAttrs)
+  return certCn && userCn && certCn === userCn
+}

package/src/plugins/Sign/sign.js

@@ -2,6 +2,7 @@
 import { Message, Notification } from 'element-ui'
 
 import { IWSAgent } from './InfosecNetSignCNGAgent.min.js'
+import { isCertCheckFailed, isDnMatched, parseCA } from './dn.js'
 
 const {
   IWSASetTimeOut,
@@ -82,7 +83,7 @@ export function verifySign(signedMsg) {
  */
 export async function getSign(plain, dn) {
   let index = await getCertInfo(dn)
-  if (index === -1) return
+  if (isCertCheckFailed(index)) return
   let plainText = typeof plain === 'object' ? JSON.stringify(plain) : plain
 
   return await performSign(plainText, index)
@@ -99,22 +100,25 @@ export function getCertInfo(dn) {
   }
   if (!dn) {
     Message.error('没有获取到签名参数DN!')
-    return false
+    return 'dnIsEmpty'
   }
   return new Promise((resolve, reject) => {
     let certInfo
     IWSAGetAllCertsListInfoByCertDN('', 'Sign', parseCA(dn), 0, (dnList) => {
       if (!dn) {
         Message.error('没有获取到签名参数DN!')
-        reject()
+        resolve('dnIsEmpty')
+        return
       }
       if (!dnList) {
         Message.error('没有获取到证书列表!')
-        reject()
+        resolve('Empty')
+        return
       }
       if (dnList.length === 0) {
         Message.error('获取到的证书列表为空!')
-        reject()
+        resolve('dnListEmpty')
+        return
       }
 
       certInfo = verifyDn(dnList, dn)
@@ -150,12 +154,6 @@ export async function performSign(plain, index) {
  * @param {string} dn 要解析的Dn
  * @returns {string} 解析后的CN
  */
-function parseCA(dn) {
-  const mark = /^CN=/
-  let CN = dn.split(',').find((b) => mark.test(b))
-  return CN ? CN.replace(mark, '') : ''
-}
-
 /**
  * 验证Dn是否存在于Dn列表中
  * @param {Array} dnList 获取到的Dn列表
@@ -163,12 +161,9 @@ function parseCA(dn) {
  * @returns {number} - 如果找到匹配的 DN，则返回其在 dnList 中的索引；如果未找到，则返回 -1
  */
 function verifyDn(dnList, dn) {
-  let userDnAttrsArr = dn.split(',').map((c) => c.trim())
-
   let index = -1
   dnList.find((C, i) => {
-    let dnAttrsArr = C.certDN.split(',').map((c) => c.trim())
-    if (userDnAttrsArr.every((dnAttr) => dnAttrsArr.includes(dnAttr))) {
+    if (isDnMatched(C.certDN, dn)) {
       index = i
       return true
     }

package/src/plugins/Sign/signV3/sign.js

@@ -2,6 +2,7 @@
 import { Message, MessageBox, Notification } from 'element-ui'
 
 import { IWSAgent } from './InfosecNetSignCNGAgent.min.js'
+import { isCertCheckFailed, isDnMatched } from '../dn.js'
 
 const {
   IWSASetTimeOut,
@@ -84,7 +85,7 @@ export function verifySign(signedMsg) {
  */
 export async function getSign(plain, dn) {
   let index = await getCertInfo(dn)
-  if (index === -1) return
+  if (isCertCheckFailed(index)) return
   let plainText = typeof plain === 'object' ? JSON.stringify(plain) : plain
   if (
     navigator.platform.toLowerCase().includes('linux') ||
@@ -119,7 +120,7 @@ export function getCertInfo(dn) {
   }
   if (!dn) {
     Message.error('没有获取到签名参数DN!')
-    return false
+    return 'dnIsEmpty'
   }
   if (
     navigator.platform.toLowerCase().includes('linux') ||
@@ -135,15 +136,18 @@ export function getCertInfo(dn) {
     IWSAGetAllCertsListInfo('infosec.sm2', 'Sign', 0, (dnList) => {
       if (!dn) {
         Message.error('没有获取到签名参数DN!')
-        reject()
+        resolve('dnIsEmpty')
+        return
       }
       if (!dnList) {
         Message.error('没有获取到证书列表!')
-        reject()
+        resolve('Empty')
+        return
       }
       if (dnList.length === 0) {
         Message.error('用户证书信息与当前用户不匹配!')
-        reject()
+        resolve('dnListEmpty')
+        return
       }
 
       certInfo = verifyDn(dnList, dn)
@@ -235,12 +239,10 @@ async function performSignSkf(plainText, value) {
  * @returns {number} - 如果找到匹配的 DN，则返回其在 dnList 中的索引；如果未找到，则返回 -1
  */
 function verifyDn(dnList, dn) {
-  let userDnAttrsArr = dn.split(',').map((c) => c.trim())
   let index = -1
   // 先过滤满足证书的条件
   let dnListA = JSON.parse(JSON.stringify(dnList)).filter((C, i) => {
-    let dnAttrsArr = C.certDN.split(',').map((c) => c.trim())
-    if (userDnAttrsArr.every((dnAttr) => dnAttrsArr.includes(dnAttr))) {
+    if (isDnMatched(C.certDN, dn)) {
       C.index = i
       certDN = C.certDN
       return C