Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix auth mechanism 1/3 #778

Merged
merged 1 commit into from
Dec 15, 2023
Merged

Fix auth mechanism 1/3 #778

merged 1 commit into from
Dec 15, 2023

Conversation

Bischoff
Copy link
Contributor

@Bischoff Bischoff commented Dec 12, 2023 •
edited
Loading

When trying to create an authentication token:

$ curl http://localhost/token -X POST -i -H "Content-Type:application/json" -H "X-Admin-Token:zvX2mFxuj8HcrYkAacLReV0RTQ0K5IIEighOR9F8AG"

a "502 bad gateway" is returned:

HTTP/1.1 502 Bad Gateway 
Server: nginx/1.18.0 (Ubuntu) 
Date: Mon, 11 Dec 2023 21:17:48 GMT 
Content-Type: text/html 
Content-Length: 166 
Connection: keep-alive 
 
<html> 
<head><title>502 Bad Gateway</title></head> 
<body> 
<center><h1>502 Bad Gateway</h1></center> 
<hr><center>nginx/1.18.0 (Ubuntu)</center> 
</body> 
</html>

Log file /var/log/nginx/error.log contains

2023/12/11 21:32:02 [error] 665#665: *15 upstream prematurely closed connection while reading response header from upstream, client: 127.0.0.1, server: _, request: "POST /token HTTP/1.1", upstream: "uwsgi://unix:///tmp/zvmsdk-wsgi.socket:", host: "localhost"

Log file /var/log/zvmsdk/uwsgi.log contains:

Traceback (most recent call last): 
 File "/usr/local/lib/python3.10/dist-packages/zVMCloudConnector-1.6.6-py3.10.egg/zvmsdk/sdkwsgi/requestlog.py", line 45, in __call__ 
   return self._log_and_call(environ, start_response) 
 File "/usr/local/lib/python3.10/dist-packages/zVMCloudConnector-1.6.6-py3.10.egg/zvmsdk/sdkwsgi/requestlog.py", line 64, in _log_and_call 
   return self.application(environ, _local_response) 
 File "/usr/local/lib/python3.10/dist-packages/WebOb-1.8.7-py3.10.egg/webob/dec.py", line 143, in __call__ 
   return resp(environ, start_response) 
 File "/usr/local/lib/python3.10/dist-packages/WebOb-1.8.7-py3.10.egg/webob/response.py", line 1312, in __call__ 
   start_response(self.status, headerlist) 
 File "/usr/local/lib/python3.10/dist-packages/zVMCloudConnector-1.6.6-py3.10.egg/zvmsdk/sdkwsgi/requestlog.py", line 57, in _local_response 
   headers[index] = ('X-Auth-Token', value[1].decode('utf-8')) 
AttributeError: 'str' object has no attribute 'decode'. Did you mean: 'encode'?

Removing the .decode('utf-8') in zvmsdk/sdkwsgi/requestlog.py resolves the issue.

This was introduced by this commit:

commit be8a31a9fa6535cceb11c34d9b739bbdab23e54e
Author: SharpRazor <[email protected]>
Date:   Fri Jul 10 10:09:41 2020 +0800

    type error reported when sending requests to WSGI in zcc
    
    this is because the data type of X-Auth-Token in headers is bytes
    but start_response expect unicode type.
    so change the type hardly, still need finding the root cause.
    
    Signed-off-by: SharpRazor <[email protected]>

diff --git a/zvmsdk/sdkwsgi/requestlog.py b/zvmsdk/sdkwsgi/requestlog.py
index 0107380e..a8db025d 100644
--- a/zvmsdk/sdkwsgi/requestlog.py
+++ b/zvmsdk/sdkwsgi/requestlog.py
@@ -49,6 +49,10 @@ class RequestLog(object):
             for name, value in headers:
                 if name.lower() == 'content-length':
                     size = value
+            for index, value in enumerate(headers):
+                if value[0] == 'X-Auth-Token':
+                    headers[index] = ('X-Auth-Token', value[1].decode('utf-8'))
+                    break
 
             self._write_log(environ, req_uri, status, size, headers,
                             exc_info)

@Bischoff Bischoff force-pushed the fix-auth-mechanism branch 2 times, most recently from 6bfca5a to 19a7fc6 Compare December 12, 2023 22:29
@Bischoff Bischoff changed the title Fix auth mechanism Fix auth mechanism 1/3 Dec 12, 2023
@Bischoff
Fix exception when using auth token
e6344b1 
Change-Id: I2eeae3c2f124de3a9ef33814bfa9f8fccfdfc2a5
Signed-off-by: Eric Bischoff <[email protected]>
bjhuangr
bjhuangr approved these changes Dec 15, 2023
View reviewed changes
Copy link
Contributor

@bjhuangr bjhuangr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@bjhuangr bjhuangr merged commit 66fde33 into openmainframeproject:master Dec 15, 2023
2 checks passed
@Bischoff
Copy link
Contributor Author

Bischoff commented Dec 15, 2023 •
edited
Loading

LGTM

Thank you. I noticed the "break" could be placed better, but that's not important.

@Bischoff Bischoff deleted the fix-auth-mechanism branch December 21, 2023 11:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bjhuangr bjhuangr bjhuangr approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@Bischoff @bjhuangr