Skip to content

Commit e2ab6fc

Browse files
authored
Merge pull request #14 from CodePapi/bulky-token-bug
Fixed complex token hashing
2 parents c341441 + 0203947 commit e2ab6fc

File tree

4 files changed

+11
-10
lines changed

4 files changed

+11
-10
lines changed

package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "n-krypta",
3-
"version": "1.0.4",
3+
"version": "1.0.5",
44
"description": "A simple encrypting and decrypting package",
55
"scripts": {
66
"start": "npm run build && node dist/index.js",

package/app.test.ts

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
11
import crpyta from './app';
22

3-
const secretKey = 'my-secret-key';
3+
const secretKey =
4+
'eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6MTI2LCJlbWFpbCI6InBzYWxtc2d1czk5QGdtYWlsLmNvbXFhd3NlIiwiZmlyc3ROYW1lIjoiRGF2aWQiLCJsYXN0TmFtZSI6Ikt1a3UiLCJtaWRkbGVOYW1lIjpudWxsLCJ1c2VyTmFtZSI6bnVsbCwiaXNWZXJpZmllZCI6ZmFsc2UsInBob25lTnVtYmVyIjoiKzM1NTgwOTY5NzA3MTEiLCJwcm9maWxlIjp7ImlkIjoxMzEsInVzZXJJZCI6MTI2LCJoZWFyZEFib3V0VXMiOiJGYWNlYm9vayIsImRhb0NvZGUiOm51bGwsInVwZGF0ZWRBdCI6IjIwMjItMTAtMDRUMTQ6MjI6MjUuNjc1WiIsImNyZWF0ZWRBdCI6IjIwMjItMTAtMDRUMTQ6MjI6MjUuNjc1WiIsInBob3RvIjpudWxsLCJyb2xlIjoidXNlciIsImlzRW50cmVwcmVuZXVyIjpmYWxzZSwiYnVzaW5lc3NJc1RocmVlWWVhcnNVcCI6ZmFsc2UsImlzU2VydmljZVByb3ZpZGVyIjpmYWxzZX0sImlhdCI6MTY2NDg5MzM1MCwiZXhwIjoxNjY1NDk4MTUwLCJpc3MiOiJUaGUgQnVzaW5lc3MgSHViIn0.D1dAATY8h4cLWon1kLk7jvNIqzv-yLSII7bTCeoE6F8CYhOuVG6VShkDGjoDePB2CUCJN5gBIzGC5pB_VlzR1vOno-EqnkFQVXwsCtVTCiTspRwJpfcRMN6WumgHQfG_3xw7t9G5ibBXlM5DgiQ9H1E2GX5mH6tHPY7bSfF2NLMO64vIAKMy1IpF5gFC_ByYqCWfaNfTQ6vhiKQ6LvOGMe-xTIiNFR_vez-Lfgb_Wz9-7ciGLxNoJ1IbS21zk4fRu3M0hisV0xDH5VJ3rDhBImLBRL4K7hE99UOyuMcadrvzJtlXG0E3Zpvfw2f00wSxkKlN3DgpVRRcLKGRovbTFuGJg77q_oi8GGGsbAA8t4XIExWiugIiZnCiWTcN0Hq_ZpxkYt-oj_F9glKdZbsqcCqjktlyT6Wqx_5vlGMUg4f15C_hsZ2bRPZWlqS3LlhgW0ZtoOBpNqGoe2xwPzYn2Trzr9qzzsQ_Wqk1_0lNRyzpOLWkqPlD7muA_3vXkpFzustCypJnuIPAtP2EbFweLOaH1rgthxSy0wqeIN-TY_84UlBhiAQ8Mn__JDEiC3XB0iLDC4_vYT7ebq871Cu_mH6CnPune2jPv15iADHbPmnAmw_yxUxRiYlDFP_mmfdNEuDaMa5BbPZNgv9h5iqvfcJnr3I1quKiZOkxUqfgs7Y';
45
describe('crypta', () => {
56
it('should return true', () => {
67
expect(crpyta).toBeDefined();
78
});
89
it('should return encrypted string', () => {
9-
expect(crpyta.encrypt('hello', secretKey)).toBe('#helmpkiller');
10+
expect(crpyta.encrypt('hello', secretKey)).toBe('#iemlokiller');
1011
});
1112
it('should return decrypted string', () => {
12-
expect(crpyta.decrypt('#helmpkiller', secretKey)).toBe('hello');
13+
expect(crpyta.decrypt('#iemlokiller', secretKey)).toBe('hello');
1314
});
1415
it('should return true', () => {
15-
expect(crpyta.compare('hello', '#helmpkiller', secretKey)).toBe(true);
16+
expect(crpyta.compare('hello', '#iemlokiller', secretKey)).toBe(true);
1617
});
1718
it('should return false', () => {
1819
expect(crpyta.compare('hello', 'iert', secretKey)).toBe(false);

package/app.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ const configNum = (num: number, i: number) =>
44
parseInt(num.toString().charAt(i % num.toString().length));
55

66
const encrypta = (st: string, salt: string, d = 1) => {
7-
const hashSalt: number = hashFun(salt.trim());
7+
const hashSalt: number = hashFun(salt.trim().substring(0, 20));
88
return st
99
.split('')
1010
.map((c, i) =>
@@ -18,7 +18,7 @@ export const encrypt = (
1818
salt: string,
1919
d = 1
2020
) => {
21-
const hashSalt: number = hashFun(salt.trim());
21+
const hashSalt: number = hashFun(salt.trim().substring(0, 20));
2222
return JSON.stringify(param)
2323
.split('')
2424
.map((c, i) =>
@@ -56,7 +56,7 @@ export const decrypt = (str: string, salt: string) => {
5656
};
5757

5858
export const compare = (string: string, hash: string, salt: string) => {
59-
return decrypt(hash, salt.trim()) === string;
59+
return decrypt(hash, salt.trim().substring(0, 20)) === string;
6060
};
6161

6262
export default { encrypt, decrypt, compare };

0 commit comments

Comments
 (0)