diff -Nru trac-httpauth-1.1+r12656/0.10/httpauth/filter.py trac-httpauth-1.2/0.10/httpauth/filter.py --- trac-httpauth-1.1+r12656/0.10/httpauth/filter.py 2009-10-11 03:07:19.000000000 +0000 +++ trac-httpauth-1.2/0.10/httpauth/filter.py 1970-01-01 00:00:00.000000000 +0000 @@ -1,76 +0,0 @@ -from trac.core import * -from trac.config import ListOption -from trac.web.api import IRequestFilter, RequestDone, IAuthenticator -from trac.web.chrome import INavigationContributor - -try: - from base64 import b64decode -except ImportError: - from base64 import decodestring as b64decode - -from acct_mgr.api import AccountManager - -__all__ = ['HTTPAuthFilter'] - -class HTTPAuthFilter(Component): - """Request filter and handler to provide HTTP authentication.""" - - paths = ListOption('httpauth', 'paths', default='/login/xmlrpc', - doc='Paths to force HTTP authentication on.') - - formats = ListOption('httpauth', 'formats', doc='Request formats to force HTTP authentication on') - - implements(IRequestFilter, IAuthenticator) - - # IRequestFilter methods - def pre_process_request(self, req, handler): - check = False - for path in self.paths: - if req.path_info.startswith(path): - check = True - break - if req.args.get('format') in self.formats: - check = True - if check and not self._check_password(req): - self.log.info('HTTPAuthFilter: No/bad authentication data given, returing 403') - return self - return handler - - def post_process_request(self, req, template, content_type): - return template, content_type - - # IRequestHandler methods (sort of) - def process_request(self, req): - if req.session: - req.session.save() # Just in case - - auth_req_msg = 'Authentication required' - req.send_response(401) - req.send_header('WWW-Authenticate', 'Basic realm="Control Panel"') - req.send_header('Content-Type', 'text/plain') - req.send_header('Pragma', 'no-cache') - req.send_header('Cache-control', 'no-cache') - req.send_header('Expires', 'Fri, 01 Jan 1999 00:00:00 GMT') - req.send_header('Content-Length', str(len(auth_req_msg))) - req.end_headers() - - if req.method != 'HEAD': - req.write(auth_req_msg) - raise RequestDone - - # IAuthenticator methods - def authenticate(self, req): - user = self._check_password(req) - if user: - req.environ['REMOTE_USER'] = user - self.log.debug('HTTPAuthFilter: Authentication okay for %s', user) - return user - - # Internal methods - def _check_password(self, req): - header = req.get_header('Authorization') - if header: - token = header.split()[1] - user, passwd = b64decode(token).split(':', 1) - if AccountManager(self.env).check_password(user, passwd): - return user diff -Nru trac-httpauth-1.1+r12656/0.10/setup.py trac-httpauth-1.2/0.10/setup.py --- trac-httpauth-1.1+r12656/0.10/setup.py 2008-03-25 06:39:08.000000000 +0000 +++ trac-httpauth-1.2/0.10/setup.py 1970-01-01 00:00:00.000000000 +0000 @@ -1,29 +0,0 @@ -#!/usr/bin/env python -# -*- coding: iso-8859-1 -*- - -from setuptools import setup - -setup( - name = 'TracHTTPAuth', - version = '1.1', - packages = ['httpauth'], - #package_data = { 'httpauth': ['templates/*.cs', 'htdocs/*.js', 'htdocs/*.css' ] }, - - author = "Noah Kantrowitz", - author_email = "noah@coderanger.net", - description = "Use the AccountManager plugin to provide HTTP authentication from Trac itself.", - license = "BSD", - keywords = "trac plugin http auth", - url = "http://trac-hacks.org/wiki/HttpAuthPlugin", - classifiers = [ - 'Framework :: Trac', - ], - - install_requires = ['TracAccountManager'], - - entry_points = { - 'trac.plugins': [ - 'httpauth.filter = httpauth.filter', - ] - } -) diff -Nru trac-httpauth-1.1+r12656/debian/changelog trac-httpauth-1.2/debian/changelog --- trac-httpauth-1.1+r12656/debian/changelog 2016-07-31 18:56:06.000000000 +0000 +++ trac-httpauth-1.2/debian/changelog 2018-11-11 00:53:25.000000000 +0000 @@ -1,3 +1,17 @@ +trac-httpauth (1.2-1) unstable; urgency=medium + + * New upstream version + + -- W. Martin Borgert Sun, 11 Nov 2018 00:53:25 +0000 + +trac-httpauth (1.1+r12656-2) UNRELEASED; urgency=medium + + * d/copyright: Use https protocol in Format field + * d/control: Set Vcs-* to salsa.debian.org + * Convert git repository from git-dpm to gbp layout + + -- Ondřej Nový Wed, 08 Aug 2018 09:23:59 +0200 + trac-httpauth (1.1+r12656-1) unstable; urgency=medium * New upstream version, only three years old diff -Nru trac-httpauth-1.1+r12656/debian/compat trac-httpauth-1.2/debian/compat --- trac-httpauth-1.1+r12656/debian/compat 2016-07-31 18:56:29.000000000 +0000 +++ trac-httpauth-1.2/debian/compat 2018-11-11 00:44:12.000000000 +0000 @@ -1 +1 @@ -7 +11 diff -Nru trac-httpauth-1.1+r12656/debian/control trac-httpauth-1.2/debian/control --- trac-httpauth-1.1+r12656/debian/control 2016-07-31 18:53:05.000000000 +0000 +++ trac-httpauth-1.2/debian/control 2018-11-11 00:44:22.000000000 +0000 @@ -1,12 +1,16 @@ Source: trac-httpauth Section: web Priority: optional -Build-Depends: python-all (>= 2.6.6-3~), python-setuptools, debhelper (>= 7.0.50~), dh-python +Build-Depends: python-all (>= 2.6.6-3~), + python-setuptools, + debhelper (>= 11~), + dh-python Maintainer: Python Applications Packaging Team Uploaders: W. Martin Borgert Standards-Version: 3.9.8 -Vcs-Git: git://anonscm.debian.org/collab-maint/trac-httpauth.git -Vcs-Browser: https://anonscm.debian.org/gitweb/?p=collab-maint/trac-httpauth.git +Rules-Requires-Root: no +Vcs-Git: https://salsa.debian.org/python-team/applications/trac-httpauth.git +Vcs-Browser: https://salsa.debian.org/python-team/applications/trac-httpauth Homepage: http://trac-hacks.org/wiki/HttpAuthPlugin Package: trac-httpauth diff -Nru trac-httpauth-1.1+r12656/debian/copyright trac-httpauth-1.2/debian/copyright --- trac-httpauth-1.1+r12656/debian/copyright 2016-07-31 18:55:17.000000000 +0000 +++ trac-httpauth-1.2/debian/copyright 2018-11-11 00:43:35.000000000 +0000 @@ -1,4 +1,4 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: HttpAuthPlugin Source: https://trac-hacks.org/wiki/HttpAuthPlugin diff -Nru trac-httpauth-1.1+r12656/debian/.git-dpm trac-httpauth-1.2/debian/.git-dpm --- trac-httpauth-1.1+r12656/debian/.git-dpm 2016-07-31 18:50:24.000000000 +0000 +++ trac-httpauth-1.2/debian/.git-dpm 1970-01-01 00:00:00.000000000 +0000 @@ -1,11 +0,0 @@ -# see git-dpm(1) from git-dpm package -aa72961af4eac9d9e76ee49da98e4f2d2620859b -aa72961af4eac9d9e76ee49da98e4f2d2620859b -aa72961af4eac9d9e76ee49da98e4f2d2620859b -aa72961af4eac9d9e76ee49da98e4f2d2620859b -trac-httpauth_1.1+r12656.orig.tar.gz -c43d49277088da7fe44b196321977c94fe56dc46 -1860 -debianTag="debian/%e%v" -patchedTag="patched/%e%v" -upstreamTag="upstream/%e%u" diff -Nru trac-httpauth-1.1+r12656/debian/rules trac-httpauth-1.2/debian/rules --- trac-httpauth-1.1+r12656/debian/rules 2016-07-31 18:50:24.000000000 +0000 +++ trac-httpauth-1.2/debian/rules 2018-11-11 00:44:12.000000000 +0000 @@ -1,4 +1,4 @@ #!/usr/bin/make -f %: - dh $@ --sourcedir=trunk --with python2 --buildsystem=python_distutils + dh $@ --with python2 --buildsystem=python_distutils diff -Nru trac-httpauth-1.1+r12656/httpauth/filter.py trac-httpauth-1.2/httpauth/filter.py --- trac-httpauth-1.1+r12656/httpauth/filter.py 1970-01-01 00:00:00.000000000 +0000 +++ trac-httpauth-1.2/httpauth/filter.py 2017-08-25 18:52:23.000000000 +0000 @@ -0,0 +1,81 @@ +from trac.core import * +from trac.config import ListOption +from trac.web.api import IRequestFilter, RequestDone, IAuthenticator +from trac.web.chrome import INavigationContributor + +try: + from base64 import b64decode +except ImportError: + from base64 import decodestring as b64decode + +from acct_mgr.api import AccountManager + +__all__ = ['HTTPAuthFilter'] + + +class HTTPAuthFilter(Component): + """Request filter and handler to provide HTTP authentication.""" + + paths = ListOption('httpauth', 'paths', default='/login/xmlrpc', + doc='Paths to force HTTP authentication on.') + + formats = ListOption('httpauth', 'formats', + doc='Request formats to force HTTP authentication on') + + implements(IRequestFilter, IAuthenticator) + + # IRequestFilter methods + def pre_process_request(self, req, handler): + check = False + for path in self.paths: + if req.path_info.startswith(path): + check = True + break + if req.args.get('format') in self.formats: + check = True + if check and not self._check_password(req): + self.log.info( + 'HTTPAuthFilter: No/bad authentication data given, returing 403') + return self + return handler + + def post_process_request(self, req, template, content_type): + return template, content_type + + # IRequestHandler methods (sort of) + def process_request(self, req): + if req.session: + req.session.save() # Just in case + + auth_req_msg = 'Authentication required' + req.send_response(401) + req.send_header('WWW-Authenticate', 'Basic realm="Control Panel"') + req.send_header('Content-Type', 'text/plain') + req.send_header('Pragma', 'no-cache') + req.send_header('Cache-control', 'no-cache') + req.send_header('Expires', 'Fri, 01 Jan 1999 00:00:00 GMT') + req.send_header('Content-Length', str(len(auth_req_msg))) + if req.get_header('Content-Length'): + req.send_header('Connection', 'close') + req.end_headers() + + if req.method != 'HEAD': + req.write(auth_req_msg) + raise RequestDone + + # IAuthenticator methods + def authenticate(self, req): + user = self._check_password(req) + if user: + req.environ['REMOTE_USER'] = user + self.log.debug('HTTPAuthFilter: Authentication okay for %s', user) + return user + + # Internal methods + def _check_password(self, req): + header = req.get_header('Authorization') + if header: + token = header.split()[1] + user, passwd = b64decode(token).split(':', 1) + if AccountManager(self.env).check_password(user, passwd): + return user diff -Nru trac-httpauth-1.1+r12656/PKG-INFO trac-httpauth-1.2/PKG-INFO --- trac-httpauth-1.1+r12656/PKG-INFO 1970-01-01 00:00:00.000000000 +0000 +++ trac-httpauth-1.2/PKG-INFO 2017-08-25 18:53:08.000000000 +0000 @@ -0,0 +1,12 @@ +Metadata-Version: 1.1 +Name: TracHTTPAuth +Version: 1.2 +Summary: Use the AccountManager plugin to provide HTTP authentication from Trac itself. +Home-page: http://trac-hacks.org/wiki/HttpAuthPlugin +Author: Craig A +Author-email: craiga@fonefit.com +License: BSD +Description: UNKNOWN +Keywords: trac plugin http auth +Platform: UNKNOWN +Classifier: Framework :: Trac diff -Nru trac-httpauth-1.1+r12656/setup.cfg trac-httpauth-1.2/setup.cfg --- trac-httpauth-1.1+r12656/setup.cfg 1970-01-01 00:00:00.000000000 +0000 +++ trac-httpauth-1.2/setup.cfg 2017-08-25 18:53:08.000000000 +0000 @@ -0,0 +1,4 @@ +[egg_info] +tag_build = +tag_date = 0 + diff -Nru trac-httpauth-1.1+r12656/setup.py trac-httpauth-1.2/setup.py --- trac-httpauth-1.1+r12656/setup.py 1970-01-01 00:00:00.000000000 +0000 +++ trac-httpauth-1.2/setup.py 2017-08-25 18:52:33.000000000 +0000 @@ -0,0 +1,31 @@ +#!/usr/bin/env python +# -*- coding: iso-8859-1 -*- + +from setuptools import setup + +setup( + name='TracHTTPAuth', + version='1.2', + packages=['httpauth'], + #package_data = { 'httpauth': ['templates/*.cs', 'htdocs/*.js', 'htdocs/*.css' ] }, + + author="Noah Kantrowitz", + author_email="noah@coderanger.net", + maintainer="Craig A", + maintainer_email="craiga@fonefit.com", + description="Use the AccountManager plugin to provide HTTP authentication from Trac itself.", + license="BSD", + keywords="trac plugin http auth", + url="http://trac-hacks.org/wiki/HttpAuthPlugin", + classifiers=[ + 'Framework :: Trac', + ], + + install_requires=['TracAccountManager'], + + entry_points={ + 'trac.plugins': [ + 'httpauth.filter = httpauth.filter', + ] + } +) diff -Nru trac-httpauth-1.1+r12656/TracHTTPAuth.egg-info/dependency_links.txt trac-httpauth-1.2/TracHTTPAuth.egg-info/dependency_links.txt --- trac-httpauth-1.1+r12656/TracHTTPAuth.egg-info/dependency_links.txt 1970-01-01 00:00:00.000000000 +0000 +++ trac-httpauth-1.2/TracHTTPAuth.egg-info/dependency_links.txt 2017-08-25 18:53:08.000000000 +0000 @@ -0,0 +1 @@ + diff -Nru trac-httpauth-1.1+r12656/TracHTTPAuth.egg-info/entry_points.txt trac-httpauth-1.2/TracHTTPAuth.egg-info/entry_points.txt --- trac-httpauth-1.1+r12656/TracHTTPAuth.egg-info/entry_points.txt 1970-01-01 00:00:00.000000000 +0000 +++ trac-httpauth-1.2/TracHTTPAuth.egg-info/entry_points.txt 2017-08-25 18:53:08.000000000 +0000 @@ -0,0 +1,3 @@ +[trac.plugins] +httpauth.filter = httpauth.filter + diff -Nru trac-httpauth-1.1+r12656/TracHTTPAuth.egg-info/PKG-INFO trac-httpauth-1.2/TracHTTPAuth.egg-info/PKG-INFO --- trac-httpauth-1.1+r12656/TracHTTPAuth.egg-info/PKG-INFO 1970-01-01 00:00:00.000000000 +0000 +++ trac-httpauth-1.2/TracHTTPAuth.egg-info/PKG-INFO 2017-08-25 18:53:08.000000000 +0000 @@ -0,0 +1,12 @@ +Metadata-Version: 1.1 +Name: TracHTTPAuth +Version: 1.2 +Summary: Use the AccountManager plugin to provide HTTP authentication from Trac itself. +Home-page: http://trac-hacks.org/wiki/HttpAuthPlugin +Author: Craig A +Author-email: craiga@fonefit.com +License: BSD +Description: UNKNOWN +Keywords: trac plugin http auth +Platform: UNKNOWN +Classifier: Framework :: Trac diff -Nru trac-httpauth-1.1+r12656/TracHTTPAuth.egg-info/requires.txt trac-httpauth-1.2/TracHTTPAuth.egg-info/requires.txt --- trac-httpauth-1.1+r12656/TracHTTPAuth.egg-info/requires.txt 1970-01-01 00:00:00.000000000 +0000 +++ trac-httpauth-1.2/TracHTTPAuth.egg-info/requires.txt 2017-08-25 18:53:08.000000000 +0000 @@ -0,0 +1 @@ +TracAccountManager diff -Nru trac-httpauth-1.1+r12656/TracHTTPAuth.egg-info/SOURCES.txt trac-httpauth-1.2/TracHTTPAuth.egg-info/SOURCES.txt --- trac-httpauth-1.1+r12656/TracHTTPAuth.egg-info/SOURCES.txt 1970-01-01 00:00:00.000000000 +0000 +++ trac-httpauth-1.2/TracHTTPAuth.egg-info/SOURCES.txt 2017-08-25 18:53:08.000000000 +0000 @@ -0,0 +1,9 @@ +setup.py +TracHTTPAuth.egg-info/PKG-INFO +TracHTTPAuth.egg-info/SOURCES.txt +TracHTTPAuth.egg-info/dependency_links.txt +TracHTTPAuth.egg-info/entry_points.txt +TracHTTPAuth.egg-info/requires.txt +TracHTTPAuth.egg-info/top_level.txt +httpauth/__init__.py +httpauth/filter.py \ No newline at end of file diff -Nru trac-httpauth-1.1+r12656/TracHTTPAuth.egg-info/top_level.txt trac-httpauth-1.2/TracHTTPAuth.egg-info/top_level.txt --- trac-httpauth-1.1+r12656/TracHTTPAuth.egg-info/top_level.txt 1970-01-01 00:00:00.000000000 +0000 +++ trac-httpauth-1.2/TracHTTPAuth.egg-info/top_level.txt 2017-08-25 18:53:08.000000000 +0000 @@ -0,0 +1 @@ +httpauth diff -Nru trac-httpauth-1.1+r12656/trunk/httpauth/filter.py trac-httpauth-1.2/trunk/httpauth/filter.py --- trac-httpauth-1.1+r12656/trunk/httpauth/filter.py 2012-11-29 17:26:08.000000000 +0000 +++ trac-httpauth-1.2/trunk/httpauth/filter.py 1970-01-01 00:00:00.000000000 +0000 @@ -1,78 +0,0 @@ -from trac.core import * -from trac.config import ListOption -from trac.web.api import IRequestFilter, RequestDone, IAuthenticator -from trac.web.chrome import INavigationContributor - -try: - from base64 import b64decode -except ImportError: - from base64 import decodestring as b64decode - -from acct_mgr.api import AccountManager - -__all__ = ['HTTPAuthFilter'] - -class HTTPAuthFilter(Component): - """Request filter and handler to provide HTTP authentication.""" - - paths = ListOption('httpauth', 'paths', default='/login/xmlrpc', - doc='Paths to force HTTP authentication on.') - - formats = ListOption('httpauth', 'formats', doc='Request formats to force HTTP authentication on') - - implements(IRequestFilter, IAuthenticator) - - # IRequestFilter methods - def pre_process_request(self, req, handler): - check = False - for path in self.paths: - if req.path_info.startswith(path): - check = True - break - if req.args.get('format') in self.formats: - check = True - if check and not self._check_password(req): - self.log.info('HTTPAuthFilter: No/bad authentication data given, returing 403') - return self - return handler - - def post_process_request(self, req, template, content_type): - return template, content_type - - # IRequestHandler methods (sort of) - def process_request(self, req): - if req.session: - req.session.save() # Just in case - - auth_req_msg = 'Authentication required' - req.send_response(401) - req.send_header('WWW-Authenticate', 'Basic realm="Control Panel"') - req.send_header('Content-Type', 'text/plain') - req.send_header('Pragma', 'no-cache') - req.send_header('Cache-control', 'no-cache') - req.send_header('Expires', 'Fri, 01 Jan 1999 00:00:00 GMT') - req.send_header('Content-Length', str(len(auth_req_msg))) - if req.get_header('Content-Length'): - req.send_header('Connection', 'close') - req.end_headers() - - if req.method != 'HEAD': - req.write(auth_req_msg) - raise RequestDone - - # IAuthenticator methods - def authenticate(self, req): - user = self._check_password(req) - if user: - req.environ['REMOTE_USER'] = user - self.log.debug('HTTPAuthFilter: Authentication okay for %s', user) - return user - - # Internal methods - def _check_password(self, req): - header = req.get_header('Authorization') - if header: - token = header.split()[1] - user, passwd = b64decode(token).split(':', 1) - if AccountManager(self.env).check_password(user, passwd): - return user diff -Nru trac-httpauth-1.1+r12656/trunk/setup.py trac-httpauth-1.2/trunk/setup.py --- trac-httpauth-1.1+r12656/trunk/setup.py 2013-02-24 13:55:10.000000000 +0000 +++ trac-httpauth-1.2/trunk/setup.py 1970-01-01 00:00:00.000000000 +0000 @@ -1,31 +0,0 @@ -#!/usr/bin/env python -# -*- coding: iso-8859-1 -*- - -from setuptools import setup - -setup( - name = 'TracHTTPAuth', - version = '1.1', - packages = ['httpauth'], - #package_data = { 'httpauth': ['templates/*.cs', 'htdocs/*.js', 'htdocs/*.css' ] }, - - author = "Noah Kantrowitz", - author_email = "noah@coderanger.net", - maintainer = "Craig A", - maintainer_email = "craiga@fonefit.com", - description = "Use the AccountManager plugin to provide HTTP authentication from Trac itself.", - license = "BSD", - keywords = "trac plugin http auth", - url = "http://trac-hacks.org/wiki/HttpAuthPlugin", - classifiers = [ - 'Framework :: Trac', - ], - - install_requires = ['TracAccountManager'], - - entry_points = { - 'trac.plugins': [ - 'httpauth.filter = httpauth.filter', - ] - } -)