[gentoo-commits] dev/ikelos:master commit in: dev-python/repoze-who-plugins-digestauth/files/, ...

[Mike Auty]

commit:     9c5f2400ad50ed24ec9407f2f272512089688ddc
Author:     layman <layman <AT> localhost>
AuthorDate: Fri Jan 29 15:54:34 2016 +0000
Commit:     Mike Auty <ikelos <AT> gentoo <DOT> org>
CommitDate: Fri Jan 29 15:54:34 2016 +0000
URL:        https://gitweb.gentoo.org/dev/ikelos.git/commit/?id=9c5f2400

Add in repoze-who-plugins-digestauth.

 dev-python/repoze-who-plugins-digestauth/ChangeLog |  21 ++++
 dev-python/repoze-who-plugins-digestauth/Manifest  |   5 +
 .../repoze-who-plugins-digestauth-python3.patch    | 121 +++++++++++++++++++++
 .../repoze-who-plugins-digestauth/metadata.xml     |  15 +++
 .../repoze-who-plugins-digestauth-0.1.1.ebuild     |  32 ++++++
 5 files changed, 194 insertions(+)

diff --git a/dev-python/repoze-who-plugins-digestauth/ChangeLog b/dev-python/repoze-who-plugins-digestauth/ChangeLog
new file mode 100644
index 0000000..28b6331
--- /dev/null
+++ b/dev-python/repoze-who-plugins-digestauth/ChangeLog
@@ -0,0 +1,21 @@
+# ChangeLog for dev-python/repoze-who
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/repoze-who/ChangeLog,v 1.5 2015/07/08 20:55:35 zlogene Exp $
+
+  08 Jul 2015; Mikle Kolyada <zlogene@g.o> repoze-who-2.2.ebuild:
+  x86 stable wrt bug #554114
+
+  07 Jul 2015; Mikle Kolyada <zlogene@g.o> repoze-who-2.2.ebuild:
+  amd64 stable wrt bug #554114
+
+  03 Jun 2015; Justin Lecher <jlec@g.o> metadata.xml:
+  Add pypi to remote-id in metadata.xml
+
+  12 Dec 2014; Michał Górny <mgorny@g.o> repoze-who-2.2.ebuild:
+  Rename net-zope/zope-interface to dev-python/zope-interface.
+
+*repoze-who-2.2 (10 Nov 2014)
+
+  10 Nov 2014; Matthew Thode <prometheanfire@g.o> +metadata.xml,
+  +repoze-who-2.2.ebuild:
+  needed as a dep of a dep of openstack

diff --git a/dev-python/repoze-who-plugins-digestauth/Manifest b/dev-python/repoze-who-plugins-digestauth/Manifest
new file mode 100644
index 0000000..f589961
--- /dev/null
+++ b/dev-python/repoze-who-plugins-digestauth/Manifest
@@ -0,0 +1,5 @@
+AUX repoze-who-plugins-digestauth-python3.patch 5488 SHA256 404489f5941a405f42adeb2a4e0db9620de069b8836545bb6353a8edd88eb728 SHA512 5b2a736285e00c8a53f83f9771754295b7ff0525284236b600af26bb4fe974c253ffb1d6d456501fc9c7f9594ff4854fe28eeaefad6e646fc853f31eb9b1270e WHIRLPOOL 395097ee6e9da53a72960ef11557fa0c0109d94b60f9d941da76f172e285bba9f4439054c281ece36e1d37126096770e42838c5322871b5356cf924b44f5184b
+DIST repoze.who.plugins.digestauth-0.1.1.tar.gz 16479 SHA256 4594155a1d4171d3935176c49b8b87048a03199e1cde83c2bff4e72e96b20a81 SHA512 48da3d18a6415a78c84f715f2fda45627d0b2104e0b52a6849dc1893499501941987f602d6e52bda73985293416d41f19887a0f79d5b1a64673a95dc2ca95813 WHIRLPOOL c0d7fe76830837bcf52d802295c2e0bbcf1aac9a0375d0818516628c860b435fbf676c169a57a16a11d22950711a366ea4124bffa8d775d3d9470d00aa7e71b6
+EBUILD repoze-who-plugins-digestauth-0.1.1.ebuild 791 SHA256 56eb1b34769158689e81deeee44fa8f3a1d0de5f10b26fe61f8971ee8fe8c83a SHA512 245cff489d5f862fb7b70a35d5377446c9efde5d78ad89f0bb0353653e6d88c32cccfa3e2be9585568ea213acc087b53f88c399461439e380294671c99dd8696 WHIRLPOOL 195db1dbdcd2e725afe7bad936900043037f95e6ceb7e57fcc3455a3e84878ed343159c941537edb0186e89930cfddc9abd3a017920690f5e6f3bf16162e194d
+MISC ChangeLog 832 SHA256 7a84b13a43ee28ce47e97dd9322619628ff693ad53c562dc01e8dcffa28892b1 SHA512 8cd128a1d9142a408360752e771d1a867c95393bd2ea84a587cf14083d00f57986378759a335b6fc19f000af871dccf4b8144dfe34a2cd796acb938b8698533d WHIRLPOOL 03668ca714b757c9117e2f084fe2efede5cfc51e54eecf5bf74ab0b14ecdd8d73535dd4e997dfea8c48d8c36e24e94cb3d80856673411114e54eae1b524b954d
+MISC metadata.xml 456 SHA256 62fff4ca239fc82c6c2a315f24176254efd7ca1e932abc79a69f7473501dfc4d SHA512 943257b6a18e32931d2a832275941838c2a3de0760ad54831180d74117e138cb5e3a916675784670ad455f4d60025c02488c60110db1780238cc17e6aee5a916 WHIRLPOOL 1271e9aebc30fb93d0a673c92b17c6975ff13c90d403487f478c365701510b44be18bcfc66f896c35ad328c9f6f7227ccc70b89e850e2142b1866f786631e14b

diff --git a/dev-python/repoze-who-plugins-digestauth/files/repoze-who-plugins-digestauth-python3.patch b/dev-python/repoze-who-plugins-digestauth/files/repoze-who-plugins-digestauth-python3.patch
new file mode 100644
index 0000000..225bafd
--- /dev/null
+++ b/dev-python/repoze-who-plugins-digestauth/files/repoze-who-plugins-digestauth-python3.patch
@@ -0,0 +1,121 @@
+diff --git a/repoze/who/plugins/digestauth/__init__.py b/repoze/who/plugins/digestauth/__init__.py
+index 849361c..6e3414e 100644
+--- a/repoze/who/plugins/digestauth/__init__.py
++++ b/repoze/who/plugins/digestauth/__init__.py
+@@ -18,7 +18,7 @@ __ver_tuple__ = (__ver_major__, __ver_minor__, __ver_patch__, __ver_sub__)
+ __version__ = "%d.%d.%d%s" % __ver_tuple__
+ 
+ 
+-from zope.interface import implements
++from zope.interface import implementer
+ 
+ from repoze.who.interfaces import IIdentifier, IChallenger, IAuthenticator
+ from repoze.who.utils import resolveDotted
+@@ -33,6 +33,7 @@ from repoze.who.plugins.digestauth.utils import (extract_digest_credentials,
+ _ENVKEY_STALE_NONCE = "repoze.who.plugins.digestauth.stale_nonce"
+ 
+ 
++@implementer(IIdentifier, IChallenger, IAuthenticator)
+ class DigestAuthPlugin(object):
+     """A repoze.who plugin for authentication via HTTP-Digest-Auth.
+ 
+@@ -76,8 +77,6 @@ class DigestAuthPlugin(object):
+     suitable for most purposes.
+     """
+ 
+-    implements(IIdentifier, IChallenger, IAuthenticator)
+-
+     def __init__(self, realm, nonce_manager=None, domain=None, qop=None,
+                  get_password=None, get_pwdhash=None):
+         if nonce_manager is None:
+@@ -244,7 +243,7 @@ class DigestAuthPlugin(object):
+         # Escape any special characters in those values, so we can send
+         # them as quoted-strings.  The extra values added below are under
+         # our control so we know they don't contain quotes.
+-        for key, value in params.iteritems():
++        for key, value in iter(params.items()):
+             params[key] = value.replace('"', '\\"')
+         # Mark the nonce as stale if told so by the environment.
+         # NOTE:  The RFC says the server "should only set stale to TRUE if
+@@ -255,7 +254,7 @@ class DigestAuthPlugin(object):
+             params["stale"] = "TRUE"
+         params["algorithm"] = "MD5"
+         # Construct the final header as quoted-string k/v pairs.
+-        value = ", ".join('%s="%s"' % itm for itm in params.iteritems())
++        value = ", ".join('%s="%s"' % itm for itm in iter(params.items()))
+         value = "Digest " + value
+         return [("WWW-Authenticate", value)]
+ 
+diff --git a/repoze/who/plugins/digestauth/noncemanager.py b/repoze/who/plugins/digestauth/noncemanager.py
+index b819532..9bb44f8 100644
+--- a/repoze/who/plugins/digestauth/noncemanager.py
++++ b/repoze/who/plugins/digestauth/noncemanager.py
+@@ -13,6 +13,7 @@ import hmac
+ import base64
+ import heapq
+ import threading
++import binascii
+ from hashlib import md5
+ 
+ from repoze.who.plugins.digestauth.utils import strings_differ
+@@ -150,7 +151,7 @@ class SignedNonceManager(object):
+             timestamp = timestamp[:-1]
+         # Add some random bytes to avoid repeating nonces when several are
+         # generated very close together.
+-        data = "%s:%s" % (timestamp, os.urandom(3).encode("hex"))
++        data = "%s:%s" % (timestamp, binascii.hexlify(os.urandom(3)))
+         # Append the signature.
+         sig = self._get_signature(data, environ)
+         return "%s:%s" % (data, sig)
+@@ -243,8 +244,8 @@ class SignedNonceManager(object):
+         """
+         # We're using md5 for the digest; using something stronger
+         # for the HMAC probably won't win us much.
+-        sig = hmac.new(self.secret, value, md5)
++        sig = hmac.new(self.secret, value.encode("ascii"), md5)
+         for header in self.sign_headers:
+-            sig.update("\x00")
+-            sig.update(environ.get(header, ""))
++            sig.update(b"\x00")
++            sig.update(environ.get(header, "").encode("ascii"))
+         return base64.b64encode(sig.digest())
+diff --git a/repoze/who/plugins/digestauth/tests.py b/repoze/who/plugins/digestauth/tests.py
+index bb5714f..c02340d 100644
+--- a/repoze/who/plugins/digestauth/tests.py
++++ b/repoze/who/plugins/digestauth/tests.py
+@@ -82,7 +82,7 @@ def build_response(environ, params, username, password, **kwds):
+         params.setdefault("nc", "0000001")
+     resp = calculate_digest_response(params, password=password)
+     params["response"] = resp
+-    authz = ",".join('%s="%s"' % v for v in params.iteritems())
++    authz = ",".join('%s="%s"' % v for v in iter(params.items()))
+     environ["HTTP_AUTHORIZATION"] = "Digest " + authz
+     return params
+ 
+@@ -218,7 +218,7 @@ class TestDigestAuthPlugin(unittest.TestCase):
+         self.assertEquals(resp, "6629fae49393a05397450978507c4ef1")
+         # Check that we can auth using it.
+         params["response"] = resp
+-        authz = ",".join('%s="%s"' % v for v in params.iteritems())
++        authz = ",".join('%s="%s"' % v for v in iter(params.items()))
+         environ = make_environ(REQUEST_METHOD="GET",
+                                PATH_INFO="/dir/index.html",
+                                HTTP_AUTHORIZATION="Digest " + authz)
+diff --git a/repoze/who/plugins/digestauth/utils.py b/repoze/who/plugins/digestauth/utils.py
+index 767b54b..dee6290 100644
+--- a/repoze/who/plugins/digestauth/utils.py
++++ b/repoze/who/plugins/digestauth/utils.py
+@@ -10,9 +10,12 @@ Helper functions for repoze.who.plugins.digestauth.
+ import re
+ import base64
+ import wsgiref.util
+-from urlparse import urlparse
+ from hashlib import md5
+ 
++try:
++    from urlparse import urlparse
++except ImportError:
++    from urllib.parse import urlparse
+ 
+ # Regular expression matching a single param in the HTTP_AUTHORIZATION header.
+ # This is basically <name>=<value> where <value> can be an unquoted token,

diff --git a/dev-python/repoze-who-plugins-digestauth/metadata.xml b/dev-python/repoze-who-plugins-digestauth/metadata.xml
new file mode 100644
index 0000000..a61ca15
--- /dev/null
+++ b/dev-python/repoze-who-plugins-digestauth/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>openstack</herd>
+  <maintainer>
+    <email>prometheanfire@g.o</email>
+    <name>Matthew Thode</name>
+  </maintainer>
+  <longdescription lang="en">
+	an identification and authentication framework for WSGI.
+	</longdescription>
+  <upstream>
+    <remote-id type="pypi">repoze.who</remote-id>
+  </upstream>
+</pkgmetadata>

diff --git a/dev-python/repoze-who-plugins-digestauth/repoze-who-plugins-digestauth-0.1.1.ebuild b/dev-python/repoze-who-plugins-digestauth/repoze-who-plugins-digestauth-0.1.1.ebuild
new file mode 100644
index 0000000..d949659
--- /dev/null
+++ b/dev-python/repoze-who-plugins-digestauth/repoze-who-plugins-digestauth-0.1.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/repoze-who/repoze-who-2.2.ebuild,v 1.4 2015/07/08 20:55:35 zlogene Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit distutils-r1
+
+MY_PN="${PN//-/.}"
+
+DESCRIPTION="repoze.who is an identification and authentication framework for WSGI."
+HOMEPAGE="http://www.repoze.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="repoze"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+RDEPEND="
+	dev-python/webob[${PYTHON_USEDEP}]
+	dev-python/zope-interface[${PYTHON_USEDEP}]
+"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-python3.patch"
+}