Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
LOFAR
Manage
Activity
Members
Labels
Plan
Issues
Wiki
Jira issues
Open Jira
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
RadioObservatory
LOFAR
Commits
84255891
Commit
84255891
authored
3 years ago
by
Jörn Künsemöller
Browse files
Options
Downloads
Patches
Plain Diff
TMSS-453
: remove broken workaround for localhost/127.0.0.1 issue with TMSSsession and fix test
parent
4f9bf137
No related branches found
No related tags found
3 merge requests
!634
WIP: COBALT commissioning delta
,
!481
Draft: SW-971 SW-973 SW-975: Various fixes to build LOFAR correctly.
,
!476
Resolve TMSS-453
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
SAS/TMSS/backend/test/t_tmssapp_authorization_REST_API.py
+1
-2
1 addition, 2 deletions
SAS/TMSS/backend/test/t_tmssapp_authorization_REST_API.py
SAS/TMSS/client/lib/tmss_http_rest_client.py
+0
-4
0 additions, 4 deletions
SAS/TMSS/client/lib/tmss_http_rest_client.py
with
1 addition
and
6 deletions
SAS/TMSS/backend/test/t_tmssapp_authorization_REST_API.py
+
1
−
2
View file @
84255891
...
@@ -115,9 +115,8 @@ class OIDCSession(unittest.TestCase):
...
@@ -115,9 +115,8 @@ class OIDCSession(unittest.TestCase):
password
=
os
.
environ
.
get
(
'
OIDC_PASSWORD
'
,
AUTH
.
password
)
password
=
os
.
environ
.
get
(
'
OIDC_PASSWORD
'
,
AUTH
.
password
)
with
TMSSsession
(
username
,
password
,
urllib
.
parse
.
urlparse
(
BASE_URL
).
hostname
,
urllib
.
parse
.
urlparse
(
BASE_URL
).
port
)
as
tmss_session
:
with
TMSSsession
(
username
,
password
,
urllib
.
parse
.
urlparse
(
BASE_URL
).
hostname
,
urllib
.
parse
.
urlparse
(
BASE_URL
).
port
)
as
tmss_session
:
r
=
tmss_session
.
session
.
get
(
BASE_URL
+
'
/task_draft/
'
)
r
=
tmss_session
.
session
.
get
(
BASE_URL
+
'
/task_draft/
'
)
logger
.
info
(
r
.
content
.
decode
(
'
utf8
'
))
self
.
assertEqual
(
r
.
status_code
,
200
)
self
.
assertEqual
(
r
.
status_code
,
200
)
self
.
assert
True
(
"
Task Draft List
"
in
r
.
content
.
decode
(
'
utf8
'
))
self
.
assert
In
(
'
results
'
,
r
.
json
(
))
class
TokenAuthTestCase
(
unittest
.
TestCase
):
class
TokenAuthTestCase
(
unittest
.
TestCase
):
...
...
This diff is collapsed.
Click to expand it.
SAS/TMSS/client/lib/tmss_http_rest_client.py
+
0
−
4
View file @
84255891
...
@@ -107,10 +107,6 @@ class TMSSsession(object):
...
@@ -107,10 +107,6 @@ class TMSSsession(object):
for
resp
in
response
.
history
:
for
resp
in
response
.
history
:
logger
.
info
(
"
via %s: %s
"
%
(
resp
.
status_code
,
resp
.
url
))
logger
.
info
(
"
via %s: %s
"
%
(
resp
.
status_code
,
resp
.
url
))
logger
.
info
(
"
got %s: %s
"
%
(
response
.
status_code
,
response
.
url
))
logger
.
info
(
"
got %s: %s
"
%
(
response
.
status_code
,
response
.
url
))
# todo: remove this ugly fix once we have a production url:
if
response
.
status_code
==
400
and
"
127.0.0.1
"
in
response
.
url
:
response
=
self
.
session
.
get
(
response
.
url
.
replace
(
'
127.0.0.1
'
,
'
localhost
'
))
logger
.
info
(
"
fix %s: %s
"
%
(
response
.
status_code
,
response
.
url
))
# post user credentials to login page, also pass csrf token if present
# post user credentials to login page, also pass csrf token if present
if
'
csrftoken
'
in
self
.
session
.
cookies
:
if
'
csrftoken
'
in
self
.
session
.
cookies
:
# Mozilla OIDC provider
# Mozilla OIDC provider
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment