Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
heptapod
heptapod
Commits
c87eee08ca10
Commit
c87eee08
authored
Oct 06, 2017
by
Kamil Trzcinski
Browse files
Improve redirect uri state and fix all remaining tests
parent
1eb0b608cc9f
Changes
7
Hide whitespace changes
Inline
Side-by-side
app/controllers/google_api/authorizations_controller.rb
View file @
c87eee08
...
...
@@ -9,6 +9,5 @@
session
[
GoogleApi
::
CloudPlatform
::
Client
.
session_key_for_expires_at
]
=
expires_at
.
to_s
key
,
_
=
GoogleApi
::
CloudPlatform
::
Client
.
session_key_for_second_redirect_uri
(
secure:
params
[
:state
])
state_redirect_uri
=
redirect_uri_from_session_key
(
params
[
:state
])
...
...
@@ -14,9 +13,7 @@
second_redirect_uri
=
session
[
key
]
if
second_redirect_uri
.
present?
redirect_to
second_redirect_uri
if
state_redirect_uri
redirect_to
state_redirect_uri
else
redirect_to
root_path
end
end
...
...
@@ -19,6 +16,14 @@
else
redirect_to
root_path
end
end
private
def
redirect_uri_from_session_key
(
state
)
key
=
GoogleApi
::
CloudPlatform
::
Client
.
session_key_for_redirect_uri
(
params
[
:state
])
session
[
key
]
if
key
end
end
end
app/controllers/projects/clusters_controller.rb
View file @
c87eee08
...
...
@@ -16,6 +16,5 @@
def
login
begin
GoogleApi
::
CloudPlatform
::
Client
.
session_key_for_second_redirect_uri
.
tap
do
|
key
,
secure
|
session
[
key
]
=
namespace_project_clusters_url
.
to_s
state
=
generate_session_key_redirect
(
namespace_project_clusters_url
.
to_s
)
...
...
@@ -21,8 +20,7 @@
@authorize_url
=
GoogleApi
::
CloudPlatform
::
Client
.
new
(
nil
,
callback_google_api_auth_url
,
state:
secure
).
authorize_url
end
@authorize_url
=
GoogleApi
::
CloudPlatform
::
Client
.
new
(
nil
,
callback_google_api_auth_url
,
state:
state
).
authorize_url
rescue
GoogleApi
::
Auth
::
ConfigMissingError
# no-op
end
...
...
@@ -122,6 +120,12 @@
session
[
GoogleApi
::
CloudPlatform
::
Client
.
session_key_for_expires_at
]
end
def
generate_session_key_redirect
(
uri
)
GoogleApi
::
CloudPlatform
::
Client
.
new_session_key_for_redirect_uri
do
|
key
|
session
[
key
]
=
uri
end
end
def
authorize_update_cluster!
access_denied!
unless
can?
(
current_user
,
:update_cluster
,
cluster
)
end
...
...
lib/google_api/cloud_platform/client.rb
View file @
c87eee08
...
...
@@ -16,9 +16,14 @@
:cloud_platform_expires_at
end
def
session_key_for_second_redirect_uri
(
secure:
nil
)
secure
=
SecureRandom
.
hex
unless
secure
return
"cloud_platform_second_redirect_uri_
#{
secure
}
"
,
secure
def
new_session_key_for_redirect_uri
SecureRandom
.
hex
.
tap
do
|
state
|
yield
session_key_for_redirect_uri
(
state
)
end
end
def
session_key_for_redirect_uri
(
state
)
"cloud_platform_second_redirect_uri_
#{
state
}
"
end
end
...
...
spec/controllers/google_api/authorizations_controller_spec.rb
View file @
c87eee08
...
...
@@ -24,5 +24,5 @@
.
to
eq
(
expires_at
)
end
context
'when
second
redirect
ion
ur
l
key is stored in state'
do
context
'when redirect ur
i
key is stored in state'
do
set
(
:project
)
{
create
(
:project
)
}
...
...
@@ -28,4 +28,4 @@
set
(
:project
)
{
create
(
:project
)
}
let
(
:
second_
redirect_uri
)
{
project_clusters_url
(
project
).
to_s
}
let
(
:redirect_uri
)
{
project_clusters_url
(
project
).
to_s
}
before
do
...
...
@@ -30,10 +30,9 @@
before
do
GoogleApi
::
CloudPlatform
::
Client
.
session_key_for_second_redirect_uri
.
tap
do
|
key
,
secure
|
@state
=
secure
session
[
key
]
=
second_redirect_uri
@state
=
GoogleApi
::
CloudPlatform
::
Client
.
new_session_key_for_redirect_uri
do
|
key
|
session
[
key
]
=
redirect_uri
end
end
it
'redirects to the URL stored in state param'
do
...
...
@@ -36,8 +35,8 @@
end
end
it
'redirects to the URL stored in state param'
do
expect
(
subject
).
to
redirect_to
(
second_
redirect_uri
)
expect
(
subject
).
to
redirect_to
(
redirect_uri
)
end
end
...
...
spec/controllers/projects/clusters_controller_spec.rb
View file @
c87eee08
...
...
@@ -190,7 +190,7 @@
subject
expect
(
response
).
to
have_http_status
(
:ok
)
expect
(
response
.
body
).
to
include
(
"Save
changes
"
)
expect
(
response
.
body
).
to
include
(
"Save"
)
end
it
"allows remove integration"
do
...
...
spec/features/projects/clusters_spec.rb
View file @
c87eee08
...
...
@@ -69,10 +69,10 @@
end
it
'user sees an cluster details page'
do
expect
(
page
).
to
have_button
(
'Save
changes
'
)
expect
(
page
).
to
have_button
(
'Save'
)
expect
(
page
.
find
(
:css
,
'.cluster-name'
).
value
).
to
eq
(
cluster
.
gcp_cluster_name
)
end
context
'when user disables the cluster'
do
before
do
page
.
find
(
:css
,
'.js-toggle-cluster'
).
click
...
...
@@ -73,10 +73,10 @@
expect
(
page
.
find
(
:css
,
'.cluster-name'
).
value
).
to
eq
(
cluster
.
gcp_cluster_name
)
end
context
'when user disables the cluster'
do
before
do
page
.
find
(
:css
,
'.js-toggle-cluster'
).
click
click_button
'Save
changes
'
click_button
'Save'
end
it
'user sees the succeccful message'
do
...
...
spec/lib/google_api/cloud_platform/client_spec.rb
View file @
c87eee08
...
...
@@ -4,6 +4,6 @@
let
(
:token
)
{
'token'
}
let
(
:client
)
{
described_class
.
new
(
token
,
nil
)
}
describe
'.session_key_for_
second_
redirect_uri'
do
subject
{
described_class
.
session_key_for_second_redirect_uri
(
secure:
secure
)
}
describe
'.session_key_for_redirect_uri'
do
let
(
:state
)
{
'random_string'
}
...
...
@@ -9,4 +9,3 @@
context
'when pass a postfix'
do
let
(
:secure
)
{
SecureRandom
.
hex
}
subject
{
described_class
.
session_key_for_redirect_uri
(
state
)
}
...
...
@@ -12,6 +11,4 @@
it
'creates a required session key'
do
key
,
_
=
described_class
.
session_key_for_second_redirect_uri
(
secure:
secure
)
expect
(
key
).
to
eq
(
"cloud_platform_second_redirect_uri_
#{
secure
}
"
)
end
it
'creates a new session key'
do
is_expected
.
to
eq
(
'cloud_platform_second_redirect_uri_random_string'
)
end
...
...
@@ -17,2 +14,3 @@
end
end
...
...
@@ -18,12 +16,8 @@
context
'when pass a postfix'
do
let
(
:secure
)
{
nil
}
it
'creates a new session key'
do
key
,
secure
=
described_class
.
session_key_for_second_redirect_uri
expect
(
key
).
to
include
(
'cloud_platform_second_redirect_uri_'
)
expect
(
secure
).
not_to
be_nil
end
describe
'.new_session_key_for_redirect_uri'
do
it
'generates a new session key'
do
expect
{
|
b
|
described_class
.
new_session_key_for_redirect_uri
(
&
b
)
}
.
to
yield_with_args
(
String
)
end
end
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment