Skip to content

Commit 41c1f0b

Browse files
committed
【update】加密工具优化; review by songym
1 parent e1ebe29 commit 41c1f0b

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

src/common/util/EncryptRequest.js

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ import {
55
AESGCMDecrypt,
66
generateAESRandomKey,
77
generateAESRandomIV
8-
} from './RSAAndAESEn-DecryptorUtil';
8+
} from './RequestcryptUtil';
9+
import URI from 'urijs';
910

1011
/**
1112
* @private
@@ -16,8 +17,8 @@ import {
1617
* @param {string} serverUrl - 服务地址。
1718
*/
1819
export class EncryptRequest {
19-
constructor(serverUrl = '') {
20-
this.serverUrl = serverUrl.split('').slice(-1)[0] === '/' ? serverUrl : `${serverUrl}/`;
20+
constructor(serverUrl) {
21+
this.serverUrl = serverUrl;
2122
this.tunnelUrl = undefined;
2223
this.blockedUrlRegex = {
2324
HEAD: [],
@@ -95,7 +96,7 @@ export class EncryptRequest {
9596
*/
9697
async _getRSAPublicKey() {
9798
try {
98-
const response = await FetchRequest.get(`${this.serverUrl}services/security/tunnel/v1/publickey`);
99+
const response = await FetchRequest.get(URI(this.serverUrl).segment('services/security/tunnel/v1/publickey').toString());
99100
// 解析publicKey
100101
const publicKeyObj = await response.json();
101102
// 生成AES密钥
@@ -126,7 +127,7 @@ export class EncryptRequest {
126127
throw 'fetch RSA publicKey failed';
127128
}
128129
// 创建隧道
129-
const response = await FetchRequest.post(`${this.serverUrl}services/security/tunnel/v1/tunnels`, data);
130+
const response = await FetchRequest.post(URI(this.serverUrl).segment('services/security/tunnel/v1/tunnels').toString(), data);
130131
const result = await response.json();
131132
Object.assign(this, {
132133
tunnelUrl: result.tunnelUrl,

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy