Show More
@@ -70,7 +70,7 b' from paste.auth.basic import AuthBasicAu' | |||||
70 | from paste.httpheaders import REMOTE_USER, AUTH_TYPE |
|
70 | from paste.httpheaders import REMOTE_USER, AUTH_TYPE | |
71 |
|
71 | |||
72 | from rhodecode.lib import safe_str |
|
72 | from rhodecode.lib import safe_str | |
73 | from rhodecode.lib.auth import authfunc, HasPermissionAnyMiddleware |
|
73 | from rhodecode.lib.auth import authfunc, HasPermissionAnyMiddleware, get_container_username | |
74 | from rhodecode.lib.utils import invalidate_cache, is_valid_repo |
|
74 | from rhodecode.lib.utils import invalidate_cache, is_valid_repo | |
75 | from rhodecode.model.db import User |
|
75 | from rhodecode.model.db import User | |
76 |
|
76 | |||
@@ -148,7 +148,7 b' class SimpleGit(object):' | |||||
148 | # NEED TO AUTHENTICATE AND ASK FOR AUTH USER PERMISSIONS |
|
148 | # NEED TO AUTHENTICATE AND ASK FOR AUTH USER PERMISSIONS | |
149 | #============================================================== |
|
149 | #============================================================== | |
150 |
|
150 | |||
151 |
if not |
|
151 | if not get_container_username(environ, self.config): | |
152 | self.authenticate.realm = \ |
|
152 | self.authenticate.realm = \ | |
153 | safe_str(self.config['rhodecode_realm']) |
|
153 | safe_str(self.config['rhodecode_realm']) | |
154 | result = self.authenticate(environ) |
|
154 | result = self.authenticate(environ) | |
@@ -164,7 +164,7 b' class SimpleGit(object):' | |||||
164 | #============================================================== |
|
164 | #============================================================== | |
165 |
|
165 | |||
166 | if action in ['pull', 'push']: |
|
166 | if action in ['pull', 'push']: | |
167 |
username = |
|
167 | username = get_container_username(environ, self.config) | |
168 | try: |
|
168 | try: | |
169 | user = self.__get_user(username) |
|
169 | user = self.__get_user(username) | |
170 | if user is None: |
|
170 | if user is None: |
General Comments 0
You need to be logged in to leave comments.
Login now