shugoi 0.4.4 → 0.4.5
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.
- checksums.yaml +4 -4
- data/lib/shugoi/api_client.rb +8 -3
- data/lib/shugoi/config_cache.rb +3 -2
- data/lib/shugoi/rack/middleware.rb +1 -1
- data/lib/shugoi/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 3f5c8d8f2dbb96ef585e0da0079fffc4ccb21cb8d3c9c488ba2e3ba2f6dcccef
|
|
4
|
+
data.tar.gz: 8dee0a01a95b9a27e34d0d131cfc24e268834f4992993d843302666c4b531b53
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: db5513f04ab846d0a248b9dd2cb6b497c74f1f72e30cf9f78c7daaaf2194f4a7b23484f03155f4144e74a2ec51df8e1bd8a3b32e415b196cff3e755d12438de5
|
|
7
|
+
data.tar.gz: b7a01c4200dda93eabe8b43adf26f6b493ff68f2fece74bb88353f78b8fc039e4c7dac3a6cf6bc40590d07c2eea0bc65d9f3ef891905ef7a45f2cde702d4c7d1
|
data/lib/shugoi/api_client.rb
CHANGED
|
@@ -14,9 +14,14 @@ module Shugoi
|
|
|
14
14
|
@debug = debug
|
|
15
15
|
end
|
|
16
16
|
|
|
17
|
-
# GET /whitelist?key=... → {
|
|
18
|
-
|
|
19
|
-
|
|
17
|
+
# GET /whitelist?key=...&cb=...&sig=... → { detectionFlags, skipPaths }
|
|
18
|
+
# La siteKey est publique ; la configuration serveur doit prouver la possession
|
|
19
|
+
# du secret de signature (parité Node/PHP, F2/F3).
|
|
20
|
+
def fetch_whitelist(site_key, secret = nil)
|
|
21
|
+
cb = SecureRandom.hex(4)
|
|
22
|
+
params = { key: site_key, cb: cb.to_s }
|
|
23
|
+
params[:sig] = Utils.hmac_hex(secret, cb.to_s) if secret && !secret.empty?
|
|
24
|
+
json = get("/whitelist", params)
|
|
20
25
|
{
|
|
21
26
|
whitelist: json["whitelistedMachines"] || [],
|
|
22
27
|
flags: json["detectionFlags"] || json["flags"] || {},
|
data/lib/shugoi/config_cache.rb
CHANGED
|
@@ -7,8 +7,9 @@ module Shugoi
|
|
|
7
7
|
TTL_MS = 30_000
|
|
8
8
|
STALE_MAX_MS = 600_000
|
|
9
9
|
|
|
10
|
-
def initialize(api_client)
|
|
10
|
+
def initialize(api_client, signing_secret = nil)
|
|
11
11
|
@api_client = api_client
|
|
12
|
+
@signing_secret = signing_secret
|
|
12
13
|
@mutex = Mutex.new
|
|
13
14
|
@whitelist = []
|
|
14
15
|
@flags = {}
|
|
@@ -30,7 +31,7 @@ module Shugoi
|
|
|
30
31
|
private
|
|
31
32
|
|
|
32
33
|
def refresh(site_key)
|
|
33
|
-
data = @api_client.fetch_whitelist(site_key)
|
|
34
|
+
data = @api_client.fetch_whitelist(site_key, @signing_secret)
|
|
34
35
|
@whitelist = data[:whitelist]
|
|
35
36
|
@flags = data[:flags]
|
|
36
37
|
@skip_paths = data[:skip_paths]
|
|
@@ -21,7 +21,7 @@ module Shugoi
|
|
|
21
21
|
# le deadlock (appels serveur→serveur qui repasseraient par le middleware public).
|
|
22
22
|
@api_internal = ApiClient.new(@config.internal_url, debug: @config.debug)
|
|
23
23
|
@guard_cache = GuardCache.new(@api_client)
|
|
24
|
-
@config_cache = ConfigCache.new(@api_internal)
|
|
24
|
+
@config_cache = ConfigCache.new(@api_internal, @config.signing_secret)
|
|
25
25
|
@token_signer = TokenSigner.new(@config.signing_secret)
|
|
26
26
|
# multi_process → stockage disque du HTML (nécessaire en cluster PM2, parité
|
|
27
27
|
# enableDiskStore(true) du module Node).
|
data/lib/shugoi/version.rb
CHANGED