Show More
@@ -167,21 +167,20 b' class SimpleGit(BaseVCSController):' | |||
|
167 | 167 | #============================================================== |
|
168 | 168 | # CHECK PERMISSIONS FOR THIS REQUEST USING GIVEN USERNAME |
|
169 | 169 | #============================================================== |
|
170 | if action in ['pull', 'push']: | |
|
171 | try: | |
|
172 |
|
|
|
173 | if user is None or not user.active: | |
|
174 | return HTTPForbidden()(environ, start_response) | |
|
175 | username = user.username | |
|
176 | except: | |
|
177 | log.error(traceback.format_exc()) | |
|
178 | return HTTPInternalServerError()(environ, | |
|
179 | start_response) | |
|
170 | try: | |
|
171 | user = self.__get_user(username) | |
|
172 | if user is None or not user.active: | |
|
173 | return HTTPForbidden()(environ, start_response) | |
|
174 | username = user.username | |
|
175 | except: | |
|
176 | log.error(traceback.format_exc()) | |
|
177 | return HTTPInternalServerError()(environ, start_response) | |
|
180 | 178 | |
|
181 |
|
|
|
182 |
|
|
|
183 |
|
|
|
184 |
|
|
|
179 | #check permissions for this repository | |
|
180 | perm = self._check_permission(action, user, repo_name) | |
|
181 | if perm is not True: | |
|
182 | return HTTPForbidden()(environ, start_response) | |
|
183 | ||
|
185 | 184 | extras = { |
|
186 | 185 | 'ip': ipaddr, |
|
187 | 186 | 'username': username, |
@@ -70,7 +70,7 b' class SimpleHg(BaseVCSController):' | |||
|
70 | 70 | return self.application(environ, start_response) |
|
71 | 71 | |
|
72 | 72 | ipaddr = self._get_ip_addr(environ) |
|
73 | ||
|
73 | username = None | |
|
74 | 74 | # skip passing error to error controller |
|
75 | 75 | environ['pylons.status_code_redirect'] = True |
|
76 | 76 | |
@@ -131,21 +131,19 b' class SimpleHg(BaseVCSController):' | |||
|
131 | 131 | #============================================================== |
|
132 | 132 | # CHECK PERMISSIONS FOR THIS REQUEST USING GIVEN USERNAME |
|
133 | 133 | #============================================================== |
|
134 | if action in ['pull', 'push']: | |
|
135 | try: | |
|
136 |
|
|
|
137 | if user is None or not user.active: | |
|
138 | return HTTPForbidden()(environ, start_response) | |
|
139 | username = user.username | |
|
140 | except: | |
|
141 | log.error(traceback.format_exc()) | |
|
142 | return HTTPInternalServerError()(environ, | |
|
143 | start_response) | |
|
134 | try: | |
|
135 | user = self.__get_user(username) | |
|
136 | if user is None or not user.active: | |
|
137 | return HTTPForbidden()(environ, start_response) | |
|
138 | username = user.username | |
|
139 | except: | |
|
140 | log.error(traceback.format_exc()) | |
|
141 | return HTTPInternalServerError()(environ, start_response) | |
|
144 | 142 | |
|
145 |
|
|
|
146 |
|
|
|
147 |
|
|
|
148 |
|
|
|
143 | #check permissions for this repository | |
|
144 | perm = self._check_permission(action, user, repo_name) | |
|
145 | if perm is not True: | |
|
146 | return HTTPForbidden()(environ, start_response) | |
|
149 | 147 | |
|
150 | 148 | # extras are injected into mercurial UI object and later available |
|
151 | 149 | # in hg hooks executed by rhodecode |
General Comments 0
You need to be logged in to leave comments.
Login now