n20-common-lib 2.13.9 → 2.13.11

package/package.json

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

package/src/components/SelectTree/index.vue

@@ -45,7 +45,9 @@
         :class="data[props.disabled] ? 'cursor-not' : ''"
         :style="{ color: data[props.disabled] ? 'var(--color-text-placeholder) ' : '' }"
       >
-        {{ props.isShowNo ? '(' + data[props.value] + ') ' + data[props.label] : data[props.label] }}
+        {{
+          props.isShowNo && data[props.value] ? '(' + data[props.value] + ') ' + data[props.label] : data[props.label]
+        }}
       </div></el-tree
     >
   </el-select>

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

@@ -5,14 +5,14 @@ import { IWSAgent } from './InfosecNetSignCNGAgent.min.js'
 const {
   IWSASetTimeOut,
   IWSAAttachedSignAdvDefaultDN,
-  IWSADetachedSignAdvDefaultDN,
+  IWSADetachedSign,
   IWSAAttachedVerify,
   IWSASendAvailable,
   IWSAGetAvailable,
   IWSAGetAllCertsListInfo
 } = new IWSAgent()
 IWSASetTimeOut(6000)
-let certType = 'RSA'
+let certIndex = 0
 let certDN = ''
 function getDN() {
   let dn
@@ -103,23 +103,21 @@ export function getCertInfo(dn) {
   return new Promise((resolve, reject) => {
     let certInfo
     IWSAGetAllCertsListInfo('infosec.sm2', 'Sign', 0, (dnList) => {
-      IWSAGetAllCertsListInfo('infosec.sm2', 'Sign', 2, (dnList2) => {
-        if (!dn) {
-          Message.error('没有获取到签名参数DN!')
-          reject()
-        }
-        if (!dnList && !dnList2) {
-          Message.error('没有获取到证书列表!')
-          reject()
-        }
-        if (dnList.length === 0 && dnList2.length === 0) {
-          Message.error('用户证书信息与当前用户不匹配!')
-          reject()
-        }
+      if (!dn) {
+        Message.error('没有获取到签名参数DN!')
+        reject()
+      }
+      if (!dnList) {
+        Message.error('没有获取到证书列表!')
+        reject()
+      }
+      if (dnList.length === 0) {
+        Message.error('用户证书信息与当前用户不匹配!')
+        reject()
+      }
 
-        certInfo = verifyDn([...dnList, ...dnList2], dn)
-        resolve(certInfo)
-      })
+      certInfo = verifyDn(dnList, dn)
+      resolve(certInfo)
     })
   })
 }
@@ -131,16 +129,12 @@ export function getCertInfo(dn) {
  * @returns {Promise<string>}  签名后的密文信息
  */
 export async function performSign(plain, index) {
-  let certStoreType = 2
-  if (certType === 'RSA') {
-    certStoreType = 1
-  }
   let signMethod = IWSAAttachedSignAdvDefaultDN
   if (window.NetSignMethod === 'Detached') {
-    signMethod = IWSADetachedSignAdvDefaultDN
+    signMethod = IWSADetachedSign
   }
   return new Promise((resolve, reject) => {
-    signMethod(plain, 'infosec.sm2', certStoreType, certDN, '1', 'SHA1', (errorCode, signedData) => {
+    signMethod(2, plain, certIndex, 'SHA1', (errorCode, signedData) => {
       if (errorCode === 0 || errorCode === '0') {
         resolve(signedData)
       } else {
@@ -159,22 +153,30 @@ export async function performSign(plain, index) {
  */
 function verifyDn(dnList, dn) {
   let userDnAttrsArr = dn.split(',').map((c) => c.trim())
-
   let index = -1
-  dnList.find((C, i) => {
+  // 先过滤满足证书的条件
+  let dnListA = JSON.parse(JSON.stringify(dnList)).filter((C, i) => {
     let dnAttrsArr = C.certDN.split(',').map((c) => c.trim())
     if (dnAttrsArr.every((dnAttr) => userDnAttrsArr.includes(dnAttr))) {
-      index = i
-      certType = C.CertType
-      certDN = C.certDN // 保存证书DN到全局变量中 =
-      return true
+      C.index = i
+      return C
     }
   })
+  if (dnListA.length > 0) {
+    dnListA.forEach((item) => {
+      if (item.certType === 'SM2' && item.keyUsage === 'signature') {
+        index = item.index
+      } else {
+        index = dnListA[0].index
+      }
+      certIndex = item.index
+    })
+  }
   if (index === -1) {
-    let dnListA = dnList?.map((res) => res.certDN)?.join(',')
+    let dnListB = dnList?.map((res) => res.certDN)?.join(',')
     Message({
       type: 'error',
-      text: `证书Dn不匹配:${dnListA}里面无法匹配===>${dn}`,
+      text: `证书Dn不匹配:${dnListB}里面无法匹配===>${dn}`,
       duration: 5000
     })
     return index