active_record_api-request 0.3.12 → 0.3.13
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/active_record_api/request/token_cache.rb +33 -12
- data/lib/active_record_api/request/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 263d60c6f20dedeb4ddf11c57f477db856bbbef2d6d4dc3b059c52d7bcae5234
|
4
|
+
data.tar.gz: aaabc4345b53434748f68dd39e3e1049d1425e2157abbd06c385cacb07e107e9
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 7da94f911d65e00e5df2efa8c242812c6279ee92aa853060adbb944d47a37ac09012a6520aff91ea1640876863927b046abad59b3b98c29ecb855bd54defc629
|
7
|
+
data.tar.gz: ab2306aec21f5841c0e88e78e9787ca4a243cb2710f9d3eb8163738024153b93c57026e8736e9a019b406d26d3ad1bf48cae5d7f57e536f1a70067ec04494384
|
@@ -8,12 +8,12 @@ module ActiveRecordApi
|
|
8
8
|
def flush
|
9
9
|
return unless defined? AUTH_REDIS_POOL
|
10
10
|
debug_log 'flushing token cache'
|
11
|
-
Honeybadger.notify(StandardError.new('token cache has been flushed'))
|
12
11
|
AUTH_REDIS_POOL.with do |client|
|
13
12
|
@redis_client = client
|
14
13
|
@redis_client.del('auth_token')
|
15
14
|
release_lock
|
16
15
|
end
|
16
|
+
debug_log 'token cache has been flushed'
|
17
17
|
end
|
18
18
|
|
19
19
|
def fetch_token(token_proc)
|
@@ -21,13 +21,13 @@ module ActiveRecordApi
|
|
21
21
|
end
|
22
22
|
|
23
23
|
def retrieve_token_from_redis(token_proc)
|
24
|
-
debug_log 'looking
|
24
|
+
debug_log 'looking for token in cache'
|
25
25
|
unless defined? AUTH_REDIS_POOL
|
26
|
-
debug_log 'no auth redis pool'
|
27
|
-
|
28
|
-
|
26
|
+
debug_log 'no auth redis pool. getting new token'
|
27
|
+
token = token_proc.call
|
28
|
+
raise "no token returned! #{token}" if @token.nil?
|
29
|
+
return token
|
29
30
|
end
|
30
|
-
debug_log 'looking for token in cache'
|
31
31
|
AUTH_REDIS_POOL.with do |client|
|
32
32
|
@redis_client = client
|
33
33
|
@token = nil
|
@@ -37,12 +37,11 @@ module ActiveRecordApi
|
|
37
37
|
@token = @redis_client.get('auth_token')
|
38
38
|
debug_log "retry ##{@retry}"
|
39
39
|
debug_log "found token: #{@token}"
|
40
|
-
if @token.nil?
|
40
|
+
if @token.nil? || session_missing_for?(@token)
|
41
41
|
if acquire_lock
|
42
42
|
begin
|
43
|
-
debug_log "acquired lock"
|
44
|
-
|
45
|
-
@token = token_proc.call()
|
43
|
+
debug_log "acquired lock and fetching token for cache"
|
44
|
+
@token = token_proc.call
|
46
45
|
raise "no token returned! #{@token}" if @token.nil?
|
47
46
|
@redis_client.set 'auth_token', @token
|
48
47
|
ensure
|
@@ -60,14 +59,36 @@ module ActiveRecordApi
|
|
60
59
|
@token
|
61
60
|
end
|
62
61
|
|
62
|
+
def redis_session_impossible?
|
63
|
+
return true unless defined? Redis
|
64
|
+
ENV['REDIS_SESSION_HOST'].nil? || ENV['REDIS_SESSION'].nil?
|
65
|
+
end
|
66
|
+
|
67
|
+
def redis_session
|
68
|
+
if redis_session_impossible?
|
69
|
+
debug_log 'Redis session environment variables not present.'
|
70
|
+
return nil
|
71
|
+
end
|
72
|
+
|
73
|
+
@redis_session ||= Redis.new({url: "redis://#{ENV['REDIS_SESSION_HOST']}", db: ENV['REDIS_SESSION']})
|
74
|
+
end
|
75
|
+
|
76
|
+
def session_missing_for?(token)
|
77
|
+
return false if redis_session.nil?
|
78
|
+
session = (redis_session.send(:get, token) if redis_session.respond_to?(:get))
|
79
|
+
debug_log("Session located for token #{token}") unless session.nil?
|
80
|
+
debug_log("Session could not be located for token #{token}") if session.nil?
|
81
|
+
session.nil?
|
82
|
+
end
|
83
|
+
|
63
84
|
def debug_log(message)
|
64
|
-
Rails.logger.info message if debug
|
85
|
+
Rails.logger.info message if debug && defined? Rails
|
65
86
|
end
|
66
87
|
|
67
88
|
def acquire_lock
|
68
89
|
@redis_client.set 'auth_token_lock', unique_key, nx: true, ex: 60
|
69
90
|
current_lock_value = @redis_client.get 'auth_token_lock'
|
70
|
-
|
91
|
+
debug_log "#{current_lock_value} == #{unique_key}"
|
71
92
|
current_lock_value == unique_key
|
72
93
|
end
|
73
94
|
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: active_record_api-request
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.3.
|
4
|
+
version: 0.3.13
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Full Measure Education
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2020-05-
|
11
|
+
date: 2020-05-21 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: active_attr
|