n20-common-lib 3.0.86 → 3.0.87

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

@@ -1,21 +1,21 @@
 // Attached方式签名
-import { Message, MessageBox, Notification } from 'element-ui'
+import { Message, MessageBox,Notification } from 'element-ui'
 import { IWSAgent } from './InfosecNetSignCNGAgent.min.js'
 
 const {
   IWSASetTimeOut,
-  IWSAAttachedSignAdvDefaultDN,
   IWSADetachedSign,
   IWSAAttachedVerify,
   IWSASendAvailable,
   IWSAGetAvailable,
   IWSAGetAllCertsListInfo,
   IWSASkfGetCertList,
-  IWSASkfDetachedSign
+  IWSASkfDetachedSignDefaultDN
 } = new IWSAgent()
 IWSASetTimeOut(6000)
 let certIndex = 0
 let certDN = ''
+let certType='SHA1'
 function getDN() {
   let dn
   let userInfo = JSON.parse(sessionStorage.getItem('userInfo'))
@@ -90,7 +90,7 @@ export async function getSign(plain, dn) {
     navigator.userAgent.toLowerCase().includes('linux') ||
     // 检查是否为银河麒麟特有的环境变量或特征
     typeof window.KylinOS !== 'undefined' ||
-    document.documentElement.dataset.osType === 'kylin'
+    document.documentElement.dataset.osType === 'kylin'||certType==='SM3'
   ) {
     // 签名
     return await MessageBox.prompt('请输入PIN码', '提示', {
@@ -101,9 +101,10 @@ export async function getSign(plain, dn) {
     }).then(({ value }) => {
       return performSignSkf(plainText, value)
     })
-  } else {
+  }else{
     return await performSign(plainText, index)
   }
+  
 }
 
 /**
@@ -189,12 +190,8 @@ export async function getCertInfoSkf(dn) {
  * @returns {Promise<string>}  签名后的密文信息
  */
 export async function performSign(plain, index) {
-  let signMethod = IWSAAttachedSignAdvDefaultDN
-  if (window.NetSignMethod === 'Detached') {
-    signMethod = IWSADetachedSign
-  }
   return new Promise((resolve, reject) => {
-    signMethod(2, plain, certIndex, 'SHA1', (errorCode, signedData) => {
+    IWSADetachedSign(2, plain, certIndex, certType, (errorCode, signedData) => {
       if (errorCode === 0 || errorCode === '0') {
         resolve(signedData)
       } else {
@@ -207,7 +204,19 @@ export async function performSign(plain, index) {
 
 async function performSignSkf(plainText, value) {
   return new Promise((resolve, reject) => {
-    IWSASkfDetachedSign(plainText, certIndex, value, 'SHA1', (errorCode, signedData) => {
+    let arg
+    if (
+      navigator.platform.toLowerCase().includes('linux') ||
+      navigator.userAgent.toLowerCase().includes('linux') ||
+      // 检查是否为银河麒麟特有的环境变量或特征
+      typeof window.KylinOS !== 'undefined' ||
+      document.documentElement.dataset.osType === 'kylin'
+    ) {
+      arg = window.VUE_APP_NetSign_ARG_Linux
+    } else {
+      arg = process.env.VUE_APP_NetSign_ARG || window.VUE_APP_NetSign_ARG || 'WTSKFInterface.dll'
+    }
+    IWSASkfDetachedSignDefaultDN(plainText, certDN, value, certType,arg,'1', (errorCode, signedData) => {
       if (errorCode === 0 || errorCode === '0') {
         resolve(signedData)
       } else {
@@ -232,6 +241,7 @@ function verifyDn(dnList, dn) {
     let dnAttrsArr = C.certDN.split(',').map((c) => c.trim())
     if (dnAttrsArr.every((dnAttr) => userDnAttrsArr.includes(dnAttr))) {
       C.index = i
+      certDN = C.certDN
       return C
     }
   })
@@ -241,6 +251,7 @@ function verifyDn(dnList, dn) {
       if (dnListA[i].CertType === 'SM2' && dnListA[i].KeyUsage === 'signature') {
         index = dnListA[i].index
         certIndex = dnListA[i].index
+        certType = 'SM3'
         break
       } else {
         index = -1
@@ -253,6 +264,7 @@ function verifyDn(dnList, dn) {
         if (dnListA[i].CertType === 'RSA') {
           index = dnListA[i].index
           certIndex = dnListA[i].index
+          certType = 'SHA1'
           break
         } else {
           index = -1