screwdriver-queue-service 2.0.47 → 3.0.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +28 -25
- package/plugins/auth/index.js +3 -4
package/package.json
CHANGED
|
@@ -1,59 +1,59 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "screwdriver-queue-service",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "3.0.0",
|
|
4
4
|
"description": "Screwdriver Queue Service API",
|
|
5
5
|
"main": "app.js",
|
|
6
6
|
"directories": {
|
|
7
7
|
"lib": "lib"
|
|
8
8
|
},
|
|
9
9
|
"dependencies": {
|
|
10
|
-
"@hapi/boom": "^
|
|
10
|
+
"@hapi/boom": "^10.0.0",
|
|
11
11
|
"@hapi/good": "^9.0.1",
|
|
12
12
|
"@hapi/good-console": "^9.0.1",
|
|
13
13
|
"@hapi/good-squeeze": "^6.0.0",
|
|
14
|
-
"@hapi/hapi": "^
|
|
15
|
-
"@hapi/hoek": "^
|
|
16
|
-
"amqp-connection-manager": "^
|
|
17
|
-
"amqplib": "^0.
|
|
14
|
+
"@hapi/hapi": "^21.1.0",
|
|
15
|
+
"@hapi/hoek": "^10.0.1",
|
|
16
|
+
"amqp-connection-manager": "^4.1.9",
|
|
17
|
+
"amqplib": "^0.10.3",
|
|
18
18
|
"blipp": "^4.0.2",
|
|
19
|
-
"circuit-fuses": "^
|
|
20
|
-
"config": "^
|
|
19
|
+
"circuit-fuses": "^5.0.0",
|
|
20
|
+
"config": "^3.3.6",
|
|
21
21
|
"cron-parser": "^4.2.1",
|
|
22
22
|
"hapi-auth-jwt2": "^10.2.0",
|
|
23
23
|
"ioredis": "^5.2.3",
|
|
24
|
-
"joi": "^17.
|
|
25
|
-
"js-yaml": "^
|
|
24
|
+
"joi": "^17.7.0",
|
|
25
|
+
"js-yaml": "^4.1.0",
|
|
26
26
|
"jsonwebtoken": "^8.5.1",
|
|
27
27
|
"node-resque": "^9.2.0",
|
|
28
28
|
"npm-auto-version": "^1.0.0",
|
|
29
29
|
"redlock": "^4.2.0",
|
|
30
|
-
"screwdriver-aws-producer-service": "^
|
|
31
|
-
"screwdriver-data-schema": "^
|
|
32
|
-
"screwdriver-executor-docker": "^
|
|
33
|
-
"screwdriver-executor-jenkins": "^
|
|
34
|
-
"screwdriver-executor-k8s": "^
|
|
30
|
+
"screwdriver-aws-producer-service": "^2.0.0",
|
|
31
|
+
"screwdriver-data-schema": "^22.0.1",
|
|
32
|
+
"screwdriver-executor-docker": "^6.0.0",
|
|
33
|
+
"screwdriver-executor-jenkins": "^6.0.0",
|
|
34
|
+
"screwdriver-executor-k8s": "^15.0.0",
|
|
35
35
|
"screwdriver-executor-k8s-vm": "^4.3.2",
|
|
36
|
-
"screwdriver-executor-router": "^
|
|
37
|
-
"screwdriver-logger": "^
|
|
38
|
-
"screwdriver-request": "^
|
|
36
|
+
"screwdriver-executor-router": "^3.0.0",
|
|
37
|
+
"screwdriver-logger": "^2.0.0",
|
|
38
|
+
"screwdriver-request": "^2.0.1",
|
|
39
39
|
"string-hash": "^1.1.3",
|
|
40
|
-
"uuid": "^
|
|
40
|
+
"uuid": "^9.0.0"
|
|
41
41
|
},
|
|
42
42
|
"devDependencies": {
|
|
43
|
-
"chai": "^4.3.
|
|
43
|
+
"chai": "^4.3.7",
|
|
44
44
|
"chai-jwt": "^2.0.0",
|
|
45
45
|
"coveralls": "^3.0.9",
|
|
46
46
|
"cucumber": "^6.0.5",
|
|
47
|
-
"eslint": "^
|
|
48
|
-
"eslint-config-screwdriver": "^
|
|
49
|
-
"mocha": "^
|
|
47
|
+
"eslint": "^8.28.0",
|
|
48
|
+
"eslint-config-screwdriver": "^7.0.0",
|
|
49
|
+
"mocha": "^10.1.0",
|
|
50
50
|
"mocha-multi-reporters": "^1.5.1",
|
|
51
51
|
"mocha-sonarqube-reporter": "^1.0.2",
|
|
52
52
|
"mockery": "^2.1.0",
|
|
53
53
|
"nyc": "^15.1.0",
|
|
54
|
-
"sinon": "^
|
|
54
|
+
"sinon": "^15.0.0",
|
|
55
55
|
"snyk": "^1.814.0",
|
|
56
|
-
"util": "^0.12.
|
|
56
|
+
"util": "^0.12.5"
|
|
57
57
|
},
|
|
58
58
|
"scripts": {
|
|
59
59
|
"start": "node ./bin/server",
|
|
@@ -81,6 +81,9 @@
|
|
|
81
81
|
"Pritam Paul <pritamstyz4ever@gmail.com>",
|
|
82
82
|
"Tiffany Kyi <tiffanykyi@gmail.com>"
|
|
83
83
|
],
|
|
84
|
+
"engines": {
|
|
85
|
+
"node": ">=18.0.0"
|
|
86
|
+
},
|
|
84
87
|
"bugs": {
|
|
85
88
|
"url": "https://github.com/screwdriver-cd/screwdriver/issues"
|
|
86
89
|
},
|
package/plugins/auth/index.js
CHANGED
|
@@ -2,12 +2,11 @@
|
|
|
2
2
|
|
|
3
3
|
const joi = require('joi');
|
|
4
4
|
const jwt = require('jsonwebtoken');
|
|
5
|
-
const
|
|
6
|
-
|
|
5
|
+
const { v4: uuidv4 } = require('uuid');
|
|
7
6
|
const DEFAULT_TIMEOUT = 60; // 1h in minutes
|
|
8
7
|
const ALGORITHM = 'RS256';
|
|
9
8
|
|
|
10
|
-
const validate = async function() {
|
|
9
|
+
const validate = async function () {
|
|
11
10
|
// The _decoded token signature is validated by jwt.veriry so we can return true
|
|
12
11
|
return { isValid: true };
|
|
13
12
|
};
|
|
@@ -81,7 +80,7 @@ const authPlugin = {
|
|
|
81
80
|
jwt.sign(profile, pluginOptions.jwtPrivateKey, {
|
|
82
81
|
algorithm: ALGORITHM,
|
|
83
82
|
expiresIn: buildTimeout * 60, // must be in second
|
|
84
|
-
jwtid:
|
|
83
|
+
jwtid: uuidv4()
|
|
85
84
|
})
|
|
86
85
|
);
|
|
87
86
|
}
|