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
48cb9fa8
Commit
48cb9fa8
authored
Dec 18, 2017
by
Stanislaw Wozniak
Committed by
Sean McGivern
Dec 18, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixes 40842 - Adds extra cookies to JIRA service requests
parent
b4ea25ca
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
31 additions
and
0 deletions
+31
-0
app/models/project_services/jira_service.rb
app/models/project_services/jira_service.rb
+2
-0
changelogs/unreleased/feature-40842-provide-oracles-webgate-cookies-to-jira-requests.yml
...0842-provide-oracles-webgate-cookies-to-jira-requests.yml
+6
-0
doc/user/project/integrations/jira.md
doc/user/project/integrations/jira.md
+3
-0
spec/models/project_services/jira_service_spec.rb
spec/models/project_services/jira_service_spec.rb
+20
-0
No files found.
app/models/project_services/jira_service.rb
View file @
48cb9fa8
...
@@ -46,6 +46,8 @@ class JiraService < IssueTrackerService
...
@@ -46,6 +46,8 @@ class JiraService < IssueTrackerService
context_path:
url
.
path
,
context_path:
url
.
path
,
auth_type: :basic
,
auth_type: :basic
,
read_timeout:
120
,
read_timeout:
120
,
use_cookies:
true
,
additional_cookies:
[
'OBBasicAuth=fromDialog'
],
use_ssl:
url
.
scheme
==
'https'
use_ssl:
url
.
scheme
==
'https'
}
}
end
end
...
...
changelogs/unreleased/feature-40842-provide-oracles-webgate-cookies-to-jira-requests.yml
0 → 100644
View file @
48cb9fa8
---
title
:
Provide additional cookies to JIRA service requests to allow Oracle WebGates
Basic Auth
merge_request
:
author
:
Stanislaw Wozniak
type
:
changed
doc/user/project/integrations/jira.md
View file @
48cb9fa8
...
@@ -98,6 +98,9 @@ password as they will be needed when configuring GitLab in the next section.
...
@@ -98,6 +98,9 @@ password as they will be needed when configuring GitLab in the next section.
-
GitLab 8.14 introduced a new way to integrate with JIRA which greatly simplified
-
GitLab 8.14 introduced a new way to integrate with JIRA which greatly simplified
the configuration options you have to enter. If you are using an older version,
the configuration options you have to enter. If you are using an older version,
[
follow this documentation
][
jira-repo-old-docs
]
.
[
follow this documentation
][
jira-repo-old-docs
]
.
-
In order to support Oracle's Access Manager, GitLab will send additional cookies
to enable Basic Auth. The cookie being added to each request is
`OBBasicAuth`
with
a value of
`fromDialog`
.
To enable JIRA integration in a project, navigate to the
To enable JIRA integration in a project, navigate to the
[
Integrations page
](
project_services.md#accessing-the-project-services
)
, click
[
Integrations page
](
project_services.md#accessing-the-project-services
)
, click
...
...
spec/models/project_services/jira_service_spec.rb
View file @
48cb9fa8
...
@@ -395,6 +395,26 @@ describe JiraService do
...
@@ -395,6 +395,26 @@ describe JiraService do
end
end
end
end
describe
'additional cookies'
do
let
(
:project
)
{
create
(
:project
)
}
context
'provides additional cookies to allow basic auth with oracle webgate'
do
before
do
@service
=
project
.
create_jira_service
(
active:
true
,
properties:
{
url:
'http://jira.com'
})
end
after
do
@service
.
destroy!
end
it
'is initialized'
do
expect
(
@service
.
options
[
:use_cookies
]).
to
eq
(
true
)
expect
(
@service
.
options
[
:additional_cookies
]).
to
eq
([
"OBBasicAuth=fromDialog"
])
end
end
end
describe
'project and issue urls'
do
describe
'project and issue urls'
do
let
(
:project
)
{
create
(
:project
)
}
let
(
:project
)
{
create
(
:project
)
}
...
...
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