n20-common-lib 2.14.21 → 2.14.22

package/package.json

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

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

@@ -16,7 +16,9 @@ let {
   SKF_EnumContainer,
   SKF_OpenContainer,
   SKF_PKCS7SignData,
-  SKF_VerifyPIN
+  SKF_VerifyPIN,
+  SKF_ExportCertificate,
+  SKF_ParseCert
 } = new SKF(location.port, 'http://127.0.0.1:2020/ssm/ukey/')
 
 function IWSAGetAvailable() {
@@ -73,6 +75,7 @@ export async function getSign(plain, dn = getDN()) {
 
   // 获取并验证证书信息
   const checkRes = await getCertInfo(dn)
+  console.log('checkRes', checkRes)
   if (checkRes === -1) {
     return ''
   }
@@ -85,6 +88,7 @@ export async function getSign(plain, dn = getDN()) {
       closeOnClickModal: false,
       inputType: 'password'
     })
+
     return await performSign(plainText, pin, checkRes)
   } catch (error) {
     return Promise.reject(error)
@@ -122,20 +126,38 @@ export async function getCertInfo(dn) {
       checkAvailable()
       reject()
     }
-
-    var rv1 = SKF_ConnectDev(rv.DevList) // 连接设备
-    var rv2 = SKF_EnumApplication(rv1.DevHandle) // 获取容器
-    var rv3 = SKF_OpenApplication(rv1.DevHandle, rv2.ApplicationList)
-    var rv4 = SKF_EnumContainer(rv3.Application)
+    const rvList = rv.DevList?.split(',')
+    let indexDn = -1
+    let Container = ''
+    let Application = ''
+    let DNList = []
+    rvList.forEach((item) => {
+      var rv1 = SKF_ConnectDev(item) // 连接设备
+      var rv2 = SKF_EnumApplication(rv1.DevHandle) // 获取容器
+      var rv3 = SKF_OpenApplication(rv1.DevHandle, rv2.ApplicationList)
+      var rv4 = SKF_EnumContainer(rv3.Application)
+      var rvList4 = rv4.ContainerList?.split(',')
+      rvList4.forEach((item2, index) => {
+        var rv5 = SKF_OpenContainer(rv3.Application, item2)
+        var rv6 = SKF_ExportCertificate(rv5.Container, true)
+        var rv7 = SKF_ParseCert(rv6.Cert)
+        DNList.push(rv7.Subject)
+        if (rv7.Subject === dn) {
+          indexDn = index
+          Container = rv5.Container
+          Application = rv3.Application
+        }
+      })
+    })
     // 检测dn是否匹配
-    /* if (rv4.ContainerList !== 'BBC92E49-4084-4d87-8037-45774F842202') {
+    if (indexDn === -1) {
+      console.log(DNList)
       Message.error('当前Ukey不匹配!')
       reject()
       return -1
     } else {
-      resolve({ ContainerList: rv4.ContainerList, Application: rv3.Application })
-    } */
-    resolve({ ContainerList: rv4.ContainerList, Application: rv3.Application })
+      resolve({ Container, Application })
+    }
   })
 }
 
@@ -145,7 +167,7 @@ export async function getCertInfo(dn) {
  * @param value
  * @returns {Promise<*>}
  */
-async function performSign(plainText, value, { ContainerList, Application }) {
+async function performSign(plainText, value, { Container, Application }) {
   return new Promise((resolve, reject) => {
     var rv5 = SKF_VerifyPIN(Application, 1, value)
     console.log(rv5)
@@ -154,31 +176,12 @@ async function performSign(plainText, value, { ContainerList, Application }) {
       reject()
       return false
     }
-    var rv6 = SKF_OpenContainer(Application, ContainerList)
-    var rv7 = SKF_PKCS7SignData(rv6.Container, plainText)
+    var rv7 = SKF_PKCS7SignData(Container, plainText)
     if (rv7.Status === 0) {
-      resolve(rv7.Signature + '@@@' + rv6.Container)
+      resolve(rv7.Signature + '@@@' + Container)
     } else {
       Message.error('签名失败!')
       reject()
     }
   })
 }
-
-/* 签名解签 */
-export async function verifySign(signedMsg) {
-  let plainText
-  await new Promise((resolve, reject) => {
-    IWSASkfVerifySignData(signedMsg, (errorCode, PlainText, certDN) => {
-      if (errorCode === 0 || errorCode === '0') {
-        plainText = PlainText
-        resolve()
-      } else {
-        Message.error(codeDate[errorCode])
-        reject()
-      }
-    })
-  })
-
-  return Promise.resolve(plainText)
-}