##// END OF EJS Templates
upstream » kallithea
RSS

Clone from https://kallithea-scm.org/repos/kallithea

pep8ify middlewares
marcink -
r1275:27232762 beta
parent child Browse files
Show More
Show file before | Show file after | Hide comments
@@ -25,7 +25,9 b''
25 25
26 26 from rhodecode.lib import str2bool
27 27
28
28 29 class HttpsFixup(object):
30
29 31 def __init__(self, app, config):
30 32 self.application = app
31 33 self.config = config
@@ -34,9 +36,9 b' class HttpsFixup(object):'
34 36 self.__fixup(environ)
35 37 return self.application(environ, start_response)
36 38
37
38 39 def __fixup(self, environ):
39 """Function to fixup the environ as needed. In order to use this
40 """
41 Function to fixup the environ as needed. In order to use this
40 42 middleware you should set this header inside your
41 43 proxy ie. nginx, apache etc.
42 44 """
Show file before | Show file after | Hide comments
@@ -30,13 +30,15 b' import traceback'
30 30
31 31 from dulwich import server as dulserver
32 32
33
33 34 class SimpleGitUploadPackHandler(dulserver.UploadPackHandler):
34 35
35 36 def handle(self):
36 37 write = lambda x: self.proto.write_sideband(1, x)
37 38
38 graph_walker = dulserver.ProtocolGraphWalker(self, self.repo.object_store,
39 self.repo.get_peeled)
39 graph_walker = dulserver.ProtocolGraphWalker(self,
40 self.repo.object_store,
41 self.repo.get_peeled)
40 42 objects_iter = self.repo.fetch_objects(
41 43 graph_walker.determine_wants, graph_walker, self.progress,
42 44 get_tagged=self.get_tagged)
@@ -46,8 +48,8 b' class SimpleGitUploadPackHandler(dulserv'
46 48 return
47 49
48 50 self.progress("counting objects: %d, done.\n" % len(objects_iter))
49 dulserver.write_pack_data(dulserver.ProtocolFile(None, write), objects_iter,
50 len(objects_iter))
51 dulserver.write_pack_data(dulserver.ProtocolFile(None, write),
52 objects_iter, len(objects_iter))
51 53 messages = []
52 54 messages.append('thank you for using rhodecode')
53 55
@@ -75,6 +77,7 b' from webob.exc import HTTPNotFound, HTTP'
75 77
76 78 log = logging.getLogger(__name__)
77 79
80
78 81 def is_git(environ):
79 82 """Returns True if request's target is git server.
80 83 ``HTTP_USER_AGENT`` would then have git client version given.
@@ -86,6 +89,7 b' def is_git(environ):'
86 89 return True
87 90 return False
88 91
92
89 93 class SimpleGit(object):
90 94
91 95 def __init__(self, application, config):
@@ -126,13 +130,14 b' class SimpleGit(object):'
126 130 if self.action in ['pull', 'push'] or self.action:
127 131 anonymous_user = self.__get_user('default')
128 132 self.username = anonymous_user.username
129 anonymous_perm = self.__check_permission(self.action, anonymous_user ,
130 self.repo_name)
133 anonymous_perm = self.__check_permission(self.action,
134 anonymous_user,
135 self.repo_name)
131 136
132 137 if anonymous_perm is not True or anonymous_user.active is False:
133 138 if anonymous_perm is not True:
134 log.debug('Not enough credentials to access this repository'
135 'as anonymous user')
139 log.debug('Not enough credentials to access this '
140 'repository as anonymous user')
136 141 if anonymous_user.active is False:
137 142 log.debug('Anonymous access is disabled, running '
138 143 'authentication')
@@ -142,7 +147,8 b' class SimpleGit(object):'
142 147 #==============================================================
143 148
144 149 if not REMOTE_USER(environ):
145 self.authenticate.realm = str(self.config['rhodecode_realm'])
150 self.authenticate.realm = str(
151 self.config['rhodecode_realm'])
146 152 result = self.authenticate(environ)
147 153 if isinstance(result, str):
148 154 AUTH_TYPE.update(environ, 'basic')
@@ -150,7 +156,6 b' class SimpleGit(object):'
150 156 else:
151 157 return result.wsgi_application(environ, start_response)
152 158
153
154 159 #==============================================================
155 160 # CHECK PERMISSIONS FOR THIS REQUEST USING GIVEN USERNAME FROM
156 161 # BASIC AUTH
@@ -163,18 +168,20 b' class SimpleGit(object):'
163 168 self.username = user.username
164 169 except:
165 170 log.error(traceback.format_exc())
166 return HTTPInternalServerError()(environ, start_response)
171 return HTTPInternalServerError()(environ,
172 start_response)
167 173
168 174 #check permissions for this repository
169 perm = self.__check_permission(self.action, user, self.repo_name)
175 perm = self.__check_permission(self.action, user,
176 self.repo_name)
170 177 if perm is not True:
171 178 print 'not allowed'
172 179 return HTTPForbidden()(environ, start_response)
173 180
174 self.extras = {'ip':self.ipaddr,
175 'username':self.username,
176 'action':self.action,
177 'repository':self.repo_name}
181 self.extras = {'ip': self.ipaddr,
182 'username': self.username,
183 'action': self.action,
184 'repository': self.repo_name}
178 185
179 186 #===================================================================
180 187 # GIT REQUEST HANDLING
@@ -199,9 +206,9 b' class SimpleGit(object):'
199 206 else:
200 207 return app(environ, start_response)
201 208
202
203 209 def __make_app(self):
204 backend = dulserver.DictBackend({'/' + self.repo_name: Repo(self.repo_path)})
210 _d = {'/' + self.repo_name: Repo(self.repo_path)}
211 backend = dulserver.DictBackend(_d)
205 212 gitserve = HTTPGitApplication(backend)
206 213
207 214 return gitserve
@@ -216,21 +223,20 b' class SimpleGit(object):'
216 223 """
217 224 if action == 'push':
218 225 if not HasPermissionAnyMiddleware('repository.write',
219 'repository.admin')\
220 (user, repo_name):
226 'repository.admin')(user,
227 repo_name):
221 228 return False
222 229
223 230 else:
224 231 #any other action need at least read permission
225 232 if not HasPermissionAnyMiddleware('repository.read',
226 233 'repository.write',
227 'repository.admin')\
228 (user, repo_name):
234 'repository.admin')(user,
235 repo_name):
229 236 return False
230 237
231 238 return True
232 239
233
234 240 def __get_repository(self, environ):
235 241 """Get's repository name out of PATH_INFO header
236 242
@@ -246,7 +252,6 b' class SimpleGit(object):'
246 252 repo_name = repo_name.split('/')[0]
247 253 return repo_name
248 254
249
250 255 def __get_user(self, username):
251 256 return UserModel().get_by_username(username, cache=True)
252 257
@@ -262,7 +267,8 b' class SimpleGit(object):'
262 267 'git-upload-pack': 'pull',
263 268 }
264 269
265 return mapping.get(service_cmd, service_cmd if service_cmd else 'other')
270 return mapping.get(service_cmd,
271 service_cmd if service_cmd else 'other')
266 272 else:
267 273 return 'other'
268 274
Show file before | Show file after | Hide comments
@@ -44,6 +44,7 b' from webob.exc import HTTPNotFound, HTTP'
44 44
45 45 log = logging.getLogger(__name__)
46 46
47
47 48 def is_mercurial(environ):
48 49 """Returns True if request's target is mercurial server - header
49 50 ``HTTP_ACCEPT`` of such request would start with ``application/mercurial``.
@@ -53,6 +54,7 b' def is_mercurial(environ):'
53 54 return True
54 55 return False
55 56
57
56 58 class SimpleHg(object):
57 59
58 60 def __init__(self, application, config):
@@ -93,13 +95,14 b' class SimpleHg(object):'
93 95 if self.action in ['pull', 'push']:
94 96 anonymous_user = self.__get_user('default')
95 97 self.username = anonymous_user.username
96 anonymous_perm = self.__check_permission(self.action, anonymous_user ,
97 self.repo_name)
98 anonymous_perm = self.__check_permission(self.action,
99 anonymous_user,
100 self.repo_name)
98 101
99 102 if anonymous_perm is not True or anonymous_user.active is False:
100 103 if anonymous_perm is not True:
101 log.debug('Not enough credentials to access this repository'
102 'as anonymous user')
104 log.debug('Not enough credentials to access this '
105 'repository as anonymous user')
103 106 if anonymous_user.active is False:
104 107 log.debug('Anonymous access is disabled, running '
105 108 'authentication')
@@ -109,7 +112,8 b' class SimpleHg(object):'
109 112 #==============================================================
110 113
111 114 if not REMOTE_USER(environ):
112 self.authenticate.realm = str(self.config['rhodecode_realm'])
115 self.authenticate.realm = str(
116 self.config['rhodecode_realm'])
113 117 result = self.authenticate(environ)
114 118 if isinstance(result, str):
115 119 AUTH_TYPE.update(environ, 'basic')
@@ -117,7 +121,6 b' class SimpleHg(object):'
117 121 else:
118 122 return result.wsgi_application(environ, start_response)
119 123
120
121 124 #==============================================================
122 125 # CHECK PERMISSIONS FOR THIS REQUEST USING GIVEN USERNAME FROM
123 126 # BASIC AUTH
@@ -130,22 +133,24 b' class SimpleHg(object):'
130 133 self.username = user.username
131 134 except:
132 135 log.error(traceback.format_exc())
133 return HTTPInternalServerError()(environ, start_response)
136 return HTTPInternalServerError()(environ,
137 start_response)
134 138
135 139 #check permissions for this repository
136 perm = self.__check_permission(self.action, user, self.repo_name)
140 perm = self.__check_permission(self.action, user,
141 self.repo_name)
137 142 if perm is not True:
138 143 return HTTPForbidden()(environ, start_response)
139 144
140 self.extras = {'ip':self.ipaddr,
141 'username':self.username,
142 'action':self.action,
143 'repository':self.repo_name}
145 self.extras = {'ip': self.ipaddr,
146 'username': self.username,
147 'action': self.action,
148 'repository': self.repo_name}
144 149
145 #===================================================================
150 #======================================================================
146 151 # MERCURIAL REQUEST HANDLING
147 #===================================================================
148 environ['PATH_INFO'] = '/'#since we wrap into hgweb, reset the path
152 #======================================================================
153 environ['PATH_INFO'] = '/' # since we wrap into hgweb, reset the path
149 154 self.baseui = make_ui('db')
150 155 self.basepath = self.config['base_path']
151 156 self.repo_path = os.path.join(self.basepath, self.repo_name)
@@ -168,7 +173,6 b' class SimpleHg(object):'
168 173
169 174 return app(environ, start_response)
170 175
171
172 176 def __make_app(self):
173 177 """Make an wsgi application using hgweb, and my generated baseui
174 178 instance
@@ -177,7 +181,6 b' class SimpleHg(object):'
177 181 hgserve = hgweb(str(self.repo_path), baseui=self.baseui)
178 182 return self.__load_web_settings(hgserve, self.extras)
179 183
180
181 184 def __check_permission(self, action, user, repo_name):
182 185 """Checks permissions using action (push/pull) user and repository
183 186 name
@@ -188,21 +191,20 b' class SimpleHg(object):'
188 191 """
189 192 if action == 'push':
190 193 if not HasPermissionAnyMiddleware('repository.write',
191 'repository.admin')\
192 (user, repo_name):
194 'repository.admin')(user,
195 repo_name):
193 196 return False
194 197
195 198 else:
196 199 #any other action need at least read permission
197 200 if not HasPermissionAnyMiddleware('repository.read',
198 201 'repository.write',
199 'repository.admin')\
200 (user, repo_name):
202 'repository.admin')(user,
203 repo_name):
201 204 return False
202 205
203 206 return True
204 207
205
206 208 def __get_repository(self, environ):
207 209 """Get's repository name out of PATH_INFO header
208 210
@@ -236,7 +238,7 b' class SimpleHg(object):'
236 238 for qry in environ['QUERY_STRING'].split('&'):
237 239 if qry.startswith('cmd'):
238 240 cmd = qry.split('=')[-1]
239 if mapping.has_key(cmd):
241 if cmd in mapping:
240 242 return mapping[cmd]
241 243 else:
242 244 return 'pull'
@@ -247,7 +249,6 b' class SimpleHg(object):'
247 249 push requests"""
248 250 invalidate_cache('get_repo_cached_%s' % repo_name)
249 251
250
251 252 def __load_web_settings(self, hgserve, extras={}):
252 253 #set the global ui for hgserve instance passed
253 254 hgserve.repo.ui = self.baseui
General Comments 0
You need to be logged in to leave comments. Login now