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
0
Merge Requests
0
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
Jérome Perrin
gitlab-ce
Commits
e8e60876
Commit
e8e60876
authored
Jun 17, 2016
by
Connor Shea
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix that which hath been broken. Except the sidekiq admin iframe.
parent
cc0d15a8
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
42 additions
and
0 deletions
+42
-0
app/controllers/admin/background_jobs_controller.rb
app/controllers/admin/background_jobs_controller.rb
+4
-0
config/initializers/secure_headers.rb
config/initializers/secure_headers.rb
+38
-0
No files found.
app/controllers/admin/background_jobs_controller.rb
View file @
e8e60876
...
@@ -2,5 +2,9 @@ class Admin::BackgroundJobsController < Admin::ApplicationController
...
@@ -2,5 +2,9 @@ class Admin::BackgroundJobsController < Admin::ApplicationController
def
show
def
show
ps_output
,
_
=
Gitlab
::
Popen
.
popen
(
%W(ps -U
#{
Gitlab
.
config
.
gitlab
.
user
}
-o pid,pcpu,pmem,stat,start,command)
)
ps_output
,
_
=
Gitlab
::
Popen
.
popen
(
%W(ps -U
#{
Gitlab
.
config
.
gitlab
.
user
}
-o pid,pcpu,pmem,stat,start,command)
)
@sidekiq_processes
=
ps_output
.
split
(
"
\n
"
).
grep
(
/sidekiq/
)
@sidekiq_processes
=
ps_output
.
split
(
"
\n
"
).
grep
(
/sidekiq/
)
override_x_frame_options
(
"SAMEORIGIN"
)
override_content_security_policy_directives
(
frame_ancestors:
%w('self')
)
end
end
end
end
config/initializers/secure_headers.rb
0 → 100644
View file @
e8e60876
SecureHeaders
::
Configuration
.
default
do
|
config
|
config
.
cookies
=
{
secure:
true
,
# mark all cookies as "Secure"
httponly:
true
,
# mark all cookies as "HttpOnly"
samesite:
{
strict:
true
# mark all cookies as SameSite=Strict
}
}
config
.
x_frame_options
=
"DENY"
config
.
x_content_type_options
=
"nosniff"
config
.
x_xss_protection
=
"1; mode=block"
config
.
x_download_options
=
"noopen"
config
.
x_permitted_cross_domain_policies
=
"none"
config
.
referrer_policy
=
"origin-when-cross-origin"
config
.
csp
=
{
# "meta" values. these will shaped the header, but the values are not included in the header.
report_only:
true
,
# default: false
preserve_schemes:
true
,
# default: false. Schemes are removed from host sources to save bytes and discourage mixed content.
# directive values: these values will directly translate into source directives
default_src:
%w('none')
,
frame_src:
%w('self')
,
connect_src:
%w('self')
,
font_src:
%w('self')
,
img_src:
%w('self' www.gravatar.com secure.gravatar.com)
,
media_src:
%w('none')
,
object_src:
%w('none')
,
script_src:
%w('unsafe-inline' 'unsafe-eval' 'self' maxcdn.bootstrapcdn.com)
,
style_src:
%w('unsafe-inline' 'self')
,
base_uri:
%w('self')
,
child_src:
%w('self')
,
form_action:
%w('self')
,
frame_ancestors:
%w('none')
,
block_all_mixed_content:
true
,
# see http://www.w3.org/TR/mixed-content/
upgrade_insecure_requests:
true
,
# see https://www.w3.org/TR/upgrade-insecure-requests/
report_uri:
%w('')
}
end
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