Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
4c784185
Commit
4c784185
authored
Apr 01, 2022
by
Paul Gascou-Vaillancourt
Committed by
mc_rocha
Apr 01, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "Merge branch 'arkose-labs-captcha-header-guard' into 'master'"
This reverts merge request !83903
parent
043a8f97
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
7 additions
and
23 deletions
+7
-23
app/controllers/sessions_controller.rb
app/controllers/sessions_controller.rb
+1
-5
app/views/devise/sessions/_new_base.html.haml
app/views/devise/sessions/_new_base.html.haml
+1
-1
ee/app/controllers/ee/sessions_controller.rb
ee/app/controllers/ee/sessions_controller.rb
+1
-6
ee/spec/views/devise/sessions/new.html.haml_spec.rb
ee/spec/views/devise/sessions/new.html.haml_spec.rb
+4
-8
spec/frontend/fixtures/sessions.rb
spec/frontend/fixtures/sessions.rb
+0
-1
spec/views/devise/sessions/new.html.haml_spec.rb
spec/views/devise/sessions/new.html.haml_spec.rb
+0
-1
spec/views/devise/shared/_signin_box.html.haml_spec.rb
spec/views/devise/shared/_signin_box.html.haml_spec.rb
+0
-1
No files found.
app/controllers/sessions_controller.rb
View file @
4c784185
...
...
@@ -39,7 +39,7 @@ class SessionsController < Devise::SessionsController
after_action
:log_failed_login
,
if: :action_new_and_failed_login?
after_action
:verify_known_sign_in
,
only:
[
:create
]
helper_method
:captcha_enabled?
,
:captcha_on_login_required?
,
:arkose_labs_enabled?
helper_method
:captcha_enabled?
,
:captcha_on_login_required?
# protect_from_forgery is already prepended in ApplicationController but
# authenticate_with_two_factor which signs in the user is prepended before
...
...
@@ -111,10 +111,6 @@ class SessionsController < Devise::SessionsController
Gitlab
::
Recaptcha
.
enabled_on_login?
&&
unverified_anonymous_user?
end
def
arkose_labs_enabled?
false
end
# From https://github.com/plataformatec/devise/wiki/How-To:-Use-Recaptcha-with-Devise#devisepasswordscontroller
def
check_captcha
return
unless
user_params
[
:password
].
present?
...
...
app/views/devise/sessions/_new_base.html.haml
View file @
4c784185
...
...
@@ -16,7 +16,7 @@
-
else
=
link_to
_
(
'Forgot your password?'
),
new_password_path
(
:user
)
%div
-
if
arkose_labs_enabled?
-
if
Feature
.
enabled?
(
:arkose_labs_login_challenge
)
=
render_if_exists
'devise/sessions/arkose_labs'
-
elsif
captcha_enabled?
||
captcha_on_login_required?
=
recaptcha_tags
nonce:
content_security_policy_nonce
...
...
ee/app/controllers/ee/sessions_controller.rb
View file @
4c784185
...
...
@@ -24,7 +24,7 @@ module EE
redirect_to
oauth_geo_auth_url
(
host:
current_node_uri
.
host
,
port:
current_node_uri
.
port
,
state:
state
)
else
if
::
Feature
.
enabled?
(
:arkose_labs_login_challenge
)
@arkose_labs_public_key
||=
Settings
.
arkose
[
'public_key
'
]
# rubocop:disable Gitlab/ModuleWithInstanceVariables
@arkose_labs_public_key
||=
ENV
[
'ARKOSE_LABS_PUBLIC_KEY
'
]
# rubocop:disable Gitlab/ModuleWithInstanceVariables
end
super
...
...
@@ -79,11 +79,6 @@ module EE
super
end
override
:arkose_labs_enabled?
def
arkose_labs_enabled?
::
Feature
.
enabled?
(
:arkose_labs_login_challenge
,
default_enabled: :yaml
)
&&
request
.
headers
[
::
SessionsController
::
CAPTCHA_HEADER
]
end
override
:check_captcha
def
check_captcha
if
::
Feature
.
enabled?
(
:arkose_labs_login_challenge
,
default_enabled: :yaml
)
...
...
ee/spec/views/devise/sessions/new.html.haml_spec.rb
View file @
4c784185
...
...
@@ -16,9 +16,9 @@ RSpec.describe 'devise/sessions/new' do
allow
(
Gitlab
).
to
receive
(
:com?
).
and_return
(
true
)
end
context
'when
arkose_labs_enabled?
is enabled'
do
context
'when
the :arkose_labs_login_challenge feature flag
is enabled'
do
before
do
stub_
arkose_labs
(
enabled
:
true
)
stub_
feature_flags
(
arkose_labs_login_challenge
:
true
)
subject
end
...
...
@@ -32,9 +32,9 @@ RSpec.describe 'devise/sessions/new' do
end
end
context
'when
arkose_labs_enabled?
is disabled'
do
context
'when
the :arkose_labs_login_challenge feature flag
is disabled'
do
before
do
stub_
arkose_labs
(
enabled
:
false
)
stub_
feature_flags
(
arkose_labs_login_challenge
:
false
)
subject
end
...
...
@@ -55,8 +55,4 @@ RSpec.describe 'devise/sessions/new' do
allow
(
view
).
to
receive
(
:captcha_enabled?
).
and_return
(
false
)
allow
(
view
).
to
receive
(
:captcha_on_login_required?
).
and_return
(
false
)
end
def
stub_arkose_labs
(
enabled
:)
allow
(
view
).
to
receive
(
:arkose_labs_enabled?
).
and_return
(
enabled
)
end
end
spec/frontend/fixtures/sessions.rb
View file @
4c784185
...
...
@@ -12,7 +12,6 @@ RSpec.describe 'Sessions (JavaScript fixtures)' do
before
do
set_devise_mapping
(
context:
@request
)
allow
(
controller
).
to
receive
(
:arkose_labs_enabled?
).
and_return
(
true
)
end
it
'sessions/new.html'
do
...
...
spec/views/devise/sessions/new.html.haml_spec.rb
View file @
4c784185
...
...
@@ -9,7 +9,6 @@ RSpec.describe 'devise/sessions/new' do
before
do
stub_devise
disable_captcha
allow
(
view
).
to
receive
(
:arkose_labs_enabled?
).
and_return
(
false
)
allow
(
Gitlab
).
to
receive
(
:com?
).
and_return
(
true
)
end
...
...
spec/views/devise/shared/_signin_box.html.haml_spec.rb
View file @
4c784185
...
...
@@ -11,7 +11,6 @@ RSpec.describe 'devise/shared/_signin_box' do
allow
(
view
).
to
receive
(
:captcha_enabled?
).
and_return
(
false
)
allow
(
view
).
to
receive
(
:captcha_on_login_required?
).
and_return
(
false
)
allow
(
view
).
to
receive
(
:experiment_enabled?
).
and_return
(
false
)
allow
(
view
).
to
receive
(
:arkose_labs_enabled?
).
and_return
(
false
)
end
it
'is shown when Crowd is enabled'
do
...
...
Write
Preview
Markdown
is supported
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