10 changed files with 238 additions and 242 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,10 +1 @@
-/kdcproxy-0.1.1.tar.gz
-/kdcproxy-0.2.tar.gz
-/kdcproxy-0.2.1.tar.gz
-/v0.3.tar.gz
-/v0.3.1.tar.gz
-/v0.3.2.tar.gz
-/kdcproxy-0.4.tar.gz
-/kdcproxy-0.4.1.tar.gz
-/kdcproxy-0.4.2.tar.gz
-/kdcproxy-1.0.0.tar.gz
+SOURCES/kdcproxy-0.4.tar.gz
--- a/.python-kdcproxy.metadata
+++ b/.python-kdcproxy.metadata
@ -0,0 +1 @@
+48cffec358fe9e15a66fb040b6b7fc87f642f6da SOURCES/kdcproxy-0.4.tar.gz
--- a/Drop-coverage-from-tests.patch
+++ b/Drop-coverage-from-tests.patch
@ -1,100 +0,0 @@
-From 7b7aee01d72be5a310678cdad189cb7382f28549 Mon Sep 17 00:00:00 2001
-From: Robbie Harwood <rharwood@redhat.com>
-Date: Tue, 19 Jan 2021 11:41:40 -0500
-Subject: [PATCH] Drop coverage from tests
-
-To my knowledge, we've never looked at or done anything with this
-output.  Test coverage is a noble goal, but this project is mostly
-complete, so we don't expect heavy development soon.
-
-Requested-by: Petr Viktorin <pviktori@redhat.com>
-Signed-off-by: Robbie Harwood <rharwood@redhat.com>
-(cherry picked from commit 86c3da13d5d6cdb5822d194f2b820da1fd31dddb)
-[rharwood@redhat.com: .gitignore]
---
- .coveragerc | 23 -----------------------
- MANIFEST.in |  1 -
- setup.py    |  2 +-
- tox.ini     | 12 ++----------
- 4 files changed, 3 insertions(+), 35 deletions(-)
- delete mode 100644 .coveragerc
-
-diff --git a/.coveragerc b/.coveragerc
-deleted file mode 100644
-index 4038562..0000000
--- a/.coveragerc
-+++ /dev/null
-@@ -1,23 +0,0 @@
-[run]
-branch = True
-source =
-    kdcproxy
-    tests.py
-
-[paths]
-source =
-   kdcproxy
-   .tox/*/lib/python*/site-packages/kdcproxy
-
-[report]
-ignore_errors = False
-precision = 1
-exclude_lines =
-    pragma: no cover
-    raise AssertionError
-    raise NotImplementedError
-    if 0:
-    if False:
-    if __name__ == .__main__.:
-    if PY3
-    if not PY3
-diff --git a/MANIFEST.in b/MANIFEST.in
-index 362f840..ff6b9a7 100644
--- a/MANIFEST.in
-+++ b/MANIFEST.in
-@@ -2,4 +2,3 @@ include README COPYING
- include tox.ini
- include setup.cfg
- include tests.py tests.krb5.conf
-include .coveragerc
-diff --git a/setup.py b/setup.py
-index 20b335e..4b34fcc 100644
--- a/setup.py
-+++ b/setup.py
-@@ -29,7 +29,7 @@ install_requires = [
- ]
- 
- extras_require = {
-    "tests": ["pytest", "coverage", "WebTest"],
-+    "tests": ["pytest", "WebTest"],
-     "test_pep8": ['flake8', 'flake8-import-order', 'pep8-naming']
- }
- 
-diff --git a/tox.ini b/tox.ini
-index 038d996..9672cee 100644
--- a/tox.ini
-+++ b/tox.ini
-@@ -1,21 +1,13 @@
- [tox]
- minversion = 2.3.1
-envlist = py36,py37,py38,py39,pep8,py3pep8,doc,coverage-report
-+envlist = py36,py37,py38,py39,pep8,py3pep8,doc
- skip_missing_interpreters = true
- 
- [testenv]
- deps =
-     .[tests]
- commands =
-    {envpython} -m coverage run --parallel \
-        -m pytest --capture=no --strict {posargs}
-
-[testenv:coverage-report]
-deps = coverage
-skip_install = true
-commands =
-    {envpython} -m coverage combine
-    {envpython} -m coverage report --show-missing
-+    {envpython} -m pytest --capture=no --strict {posargs}
- 
- [testenv:pep8]
- basepython = python3
--- a/SOURCES/Always-buffer-TCP-data-in-__handle_recv.patch
+++ b/SOURCES/Always-buffer-TCP-data-in-__handle_recv.patch
@ -0,0 +1,84 @@
+From c1be487bb00f2e813212031d93fcebbfbd0da60b Mon Sep 17 00:00:00 2001
+From: Robbie Harwood <rharwood@redhat.com>
+Date: Thu, 29 Aug 2019 11:13:41 -0400
+Subject: [PATCH] Always buffer TCP data in __handle_recv()
+
+Refactor __handle_recv() to always create a BytesIO() object for TCP
+data.  Linearize control flow for ease of debugging.  Always apply
+length checks so that we don't have to wait for EOF in the multiple-recv
+case.
+
+Fixes a bug where we wouldn't return any data because we never received
+the EOF, or didn't receive it fast enough.
+
+Signed-off-by: Robbie Harwood <rharwood@redhat.com>
+(cherry picked from commit 7e2b1ab27b843c220fe301b74bab01ed61b0f59a)
+---
+ kdcproxy/__init__.py | 54 +++++++++++++++++++++++++-------------------
+ 1 file changed, 31 insertions(+), 23 deletions(-)
+
+diff --git a/kdcproxy/__init__.py b/kdcproxy/__init__.py
+index 6526bc9..9bc7044 100644
+--- a/kdcproxy/__init__.py
+++ b/kdcproxy/__init__.py
+@@ -128,29 +128,37 @@ class Application:
+             # length prefix. So add it.
+             reply = struct.pack("!I", len(reply)) + reply
+             return reply
+-        else:
+-            # TCP is a different story. The reply must be buffered
+-            # until the full answer is accumulated.
+-            buf = read_buffers.get(sock)
+-            part = sock.recv(1048576)
+-            if buf is None:
+-                if len(part) > 4:
+-                    # got enough data in the initial package. Now check
+-                    # if we got the full package in the first run.
+-                    (length, ) = struct.unpack("!I", part[0:4])
+-                    if length + 4 == len(part):
+-                        return part
+-                read_buffers[sock] = buf = io.BytesIO()
+-
+-            if part:
+-                # data received, accumulate it in a buffer
+-                buf.write(part)
+-                return None
+-            else:
+-                # EOF received
+-                read_buffers.pop(sock)
+-                reply = buf.getvalue()
+-                return reply
+
+        # TCP is a different story. The reply must be buffered until the full
+        # answer is accumulated.
+        buf = read_buffers.get(sock)
+        if buf is None:
+            read_buffers[sock] = buf = io.BytesIO()
+
+        part = sock.recv(1048576)
+        if not part:
+            # EOF received.  Return any incomplete data we have on the theory
+            # that a decode error is more apparent than silent failure.  The
+            # client will fail faster, at least.
+            read_buffers.pop(sock)
+            reply = buf.getvalue()
+            return reply
+
+        # Data received, accumulate it in a buffer.
+        buf.write(part)
+
+        reply = buf.getvalue()
+        if len(reply) < 4:
+            # We don't have the length yet.
+            return None
+
+        # Got enough data to check if we have the full package.
+        (length, ) = struct.unpack("!I", reply[0:4])
+        if length + 4 == len(reply):
+            read_buffers.pop(sock)
+            return reply
+
+        return None
+ 
+     def __filter_addr(self, addr):
+         if addr[0] not in (socket.AF_INET, socket.AF_INET6):
--- a/SOURCES/Correct-addrs-sorting-to-be-by-TCP-UDP.patch
+++ b/SOURCES/Correct-addrs-sorting-to-be-by-TCP-UDP.patch
@ -0,0 +1,28 @@
+From 5cfde6d085320da3fb5d4c6506e6d6253438669c Mon Sep 17 00:00:00 2001
+From: Robbie Harwood <rharwood@redhat.com>
+Date: Fri, 2 Aug 2019 13:54:05 -0400
+Subject: [PATCH] Correct addrs sorting to be by TCP/UDP
+
+Fixes any potential cases where the resolver might yield UDP addresses
+first.
+
+Signed-off-by: Robbie Harwood <rharwood@redhat.com>
+(cherry picked from commit d0b35c2b71a172f409b4311d36538d8fa3433c58)
+---
+ kdcproxy/__init__.py | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/kdcproxy/__init__.py b/kdcproxy/__init__.py
+index c59f2b3..6526bc9 100644
+--- a/kdcproxy/__init__.py
+++ b/kdcproxy/__init__.py
+@@ -227,7 +227,8 @@ class Application:
+                 #
+                 # Stick a None address on the end so we can get one
+                 # more attempt after all servers have been contacted.
+-                addrs = tuple(sorted(filter(self.__filter_addr, addrs)))
+                addrs = tuple(sorted(filter(self.__filter_addr, addrs),
+                                     key=lambda a: a[2]))
+                 for addr in addrs + (None,):
+                     if addr is not None:
+                         # Bypass unspecified socktypes
--- a/SOURCES/Make-webtest-an-optional-dependency.patch
+++ b/SOURCES/Make-webtest-an-optional-dependency.patch
@ -0,0 +1,36 @@
+From 2164f10fe5d992006f42c4a8d682f23b04ffbf12 Mon Sep 17 00:00:00 2001
+From: Robbie Harwood <rharwood@redhat.com>
+Date: Thu, 9 Aug 2018 14:57:56 -0400
+Subject: [PATCH] Make webtest an optional dependency
+
+Resolves: #38
+(cherry picked from commit c0bee88c60deb176d420d90447d24c370d70727a)
+---
+ tests.py | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/tests.py b/tests.py
+index 992529f..c2b1fc0 100644
+--- a/tests.py
+++ b/tests.py
+@@ -33,7 +33,11 @@ from dns.rdataclass import IN as RDCLASS_IN
+ from dns.rdatatype import SRV as RDTYPE_SRV
+ from dns.rdtypes.IN.SRV import SRV
+ 
+-from webtest import TestApp as WebTestApp
+try:
+    from webtest import TestApp as WebTestApp
+except ImportError:
+    print("webtest not installed!  Tests will be skipped")
+    WebTestApp = "skip"
+ 
+ import kdcproxy
+ from kdcproxy import codec
+@@ -45,6 +49,7 @@ HERE = os.path.dirname(os.path.abspath(__file__))
+ KRB5_CONFIG = os.path.join(HERE, 'tests.krb5.conf')
+ 
+ 
+@unittest.skipIf(WebTestApp == "skip", "webtest not installed")
+ class KDCProxyWSGITests(unittest.TestCase):
+     addrinfo = [
+         (2, 1, 6, '', ('128.66.0.2', 88)),
--- a/SPECS/python-kdcproxy.spec
+++ b/SPECS/python-kdcproxy.spec
@ -1,34 +1,76 @@
 %global realname kdcproxy

+%if 0%{?fedora} || 0%{?rhel} > 7
+%global with_python3 1
+%else
+%global with_python3 0
+%endif
+
+%if 0%{?fedora} || 0%{?rhel} <= 7
+%global with_python2 1
+%else
+%global with_python2 0
+%endif
+
 Name:           python-%{realname}
-Version:        1.0.0
-Release:        17%{?dist}
+Version:        0.4
+Release:        5%{?dist}
 Summary:        MS-KKDCP (kerberos proxy) WSGI module

 License:        MIT
-URL:            https://github.com/latchset/%{realname}
-Source0:        https://github.com/latchset/%{realname}/archive/%{realname}-%{version}.tar.gz
+URL:            https://github.com/npmccallum/%{realname}
+Source0:        https://github.com/npmccallum/%{realname}/archive/%{realname}-%{version}.tar.gz

-Patch0: Drop-coverage-from-tests.patch
+Patch0: Make-webtest-an-optional-dependency.patch
+Patch1: Correct-addrs-sorting-to-be-by-TCP-UDP.patch
+Patch2: Always-buffer-TCP-data-in-__handle_recv.patch

 BuildArch:      noarch
 BuildRequires:  git

+%if 0%{?with_python2} > 0
+BuildRequires:  python2-devel
+BuildRequires:  python2-pytest
+BuildRequires:  python2-coverage
+BuildRequires:  python2-asn1crypto
+BuildRequires:  python2-dns
+BuildRequires:  python2-mock
+%endif
+
+%if 0%{?with_python3} > 0
 BuildRequires:  python3-devel
-BuildRequires:  python3-dns
-BuildRequires:  python3-pyasn1
 BuildRequires:  python3-pytest
-BuildRequires:  python3-setuptools
+BuildRequires:  python3-coverage
+BuildRequires:  python3-asn1crypto
+BuildRequires:  python3-dns
+BuildRequires:  python3-mock
+%endif
+

 %description
 This package contains a Python WSGI module for proxying KDC requests over
 HTTP by following the MS-KKDCP protocol. It aims to be simple to deploy, with
 minimal configuration.

+%if 0%{?with_python2} > 0
+%package -n python2-%{realname}
+Summary:        MS-KKDCP (kerberos proxy) WSGI module
+Requires:       python2-dns
+Requires:       python2-asn1crypto
+
+%{?python_provide:%python_provide python2-%{realname}}
+
+%description -n python2-%{realname}
+This package contains a Python 2.x WSGI module for proxying KDC requests over
+HTTP by following the MS-KKDCP protocol. It aims to be simple to deploy, with
+minimal configuration.
+%endif
+
+%if 0%{?with_python3} > 0
 %package -n python3-%{realname}
 Summary:        MS-KKDCP (kerberos proxy) WSGI module
 Requires:       python3-dns
-Requires:       python3-pyasn1
+Requires:       python3-asn1crypto

 %{?python_provide:%python_provide python3-%{realname}}

@ -36,115 +78,64 @@ Requires:       python3-pyasn1
 This package contains a Python 3.x WSGI module for proxying KDC requests over
 HTTP by following the MS-KKDCP protocol. It aims to be simple to deploy, with
 minimal configuration.
+%endif

 %prep
 %autosetup -S git -n %{realname}-%{version}

+
 %build
+%if 0%{?with_python2} > 0
+%py2_build
+%endif
+%if 0%{?with_python3} > 0
 %py3_build
+%endif

 %install
+%if 0%{?with_python2} > 0
+%py2_install
+%endif
+%if 0%{?with_python3} > 0
 %py3_install
+%endif

 %check
-%{__python3} -m pytest
+%if 0%{?with_python2} > 0
+KDCPROXY_ASN1MOD=asn1crypto %{__python2} -m pytest
+%endif
+%if 0%{?with_python3} > 0
+KDCPROXY_ASN1MOD=asn1crypto %{__python3} -m pytest
+%endif

+%if 0%{?with_python2} > 0
+%files -n python2-%{realname}
+%doc README
+%license COPYING
+%{python2_sitelib}/%{realname}/
+%{python2_sitelib}/%{realname}-%{version}-*.egg-info
+%endif
+
+%if 0%{?with_python3} > 0
 %files -n python3-%{realname}
 %doc README
 %license COPYING
 %{python3_sitelib}/%{realname}/
 %{python3_sitelib}/%{realname}-%{version}-*.egg-info
+%endif

 %changelog
-* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 1.0.0-17
- Bump release for October 2024 mass rebuild:
-  Resolves: RHEL-64018
+* Fri Oct 25 2019 Robbie Harwood <rharwood@redhat.com> - 0.4-5
+- Always buffer TCP data in __handle_recv()
+- Resolves: #1747144

-* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1.0.0-16
- Bump release for June 2024 mass rebuild
+* Fri Oct 25 2019 Robbie Harwood <rharwood@redhat.com> - 0.4-4
+- Correct addrs sorting to be by TCP/UDP
+- Resolves: #1732898

-* Fri Jan 26 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.0-15
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.0-14
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.0-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Thu Jun 15 2023 Python Maint <python-maint@redhat.com> - 1.0.0-12
- Rebuilt for Python 3.12
-
-* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.0-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.0-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Tue Jun 14 2022 Python Maint <python-maint@redhat.com> - 1.0.0-9
- Rebuilt for Python 3.11
-
-* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.0-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.0-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 1.0.0-6
- Rebuilt for Python 3.10
-
-* Thu Apr 08 2021 Robbie Harwood <rharwood@redhat.com> - 1.0.0-5
- Actually drop coverage dependency
-
-* Fri Jan 29 2021 Robbie Harwood <rharwood@redhat.com> - 1.0.0-4
- Drop unused dependency on python3-mock
- Resolves: #1922344
-
-* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Wed Jan 20 2021 Robbie Harwood <rharwood@redhat.com> - 1.0.0-2
- Drop coverage from tests
- Resolves: #1916739
-
-* Tue Dec 08 2020 Robbie Harwood <rharwood@redhat.com> - 1.0.0-1
- New upstream version (1.0.0)
- Drop asn1crypto in favor of pyasn1
-
-* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.2-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Thu Jun 25 2020 Robbie Harwood <rharwood@redhat.com> - 0.4.2-5
- Explicitly depend on python3-setuptools
-
-* Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 0.4.2-4
- Rebuilt for Python 3.9
-
-* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.2-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 0.4.2-2
- Rebuilt for Python 3.8.0rc1 (#1748018)
-
-* Thu Aug 29 2019 Robbie Harwood <rharwood@redhat.com> - 0.4.2-1
- New upstream version (0.4.2)
-
-* Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 0.4.1-3
- Rebuilt for Python 3.8
-
-* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Mon Feb 11 2019 Robbie Harwood <rharwood@redhdat.com> 0.4.1-1
- New upstream release - 0.4.1
- Fixes build with rawhide (dnspython/dnspython3)
-
-* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.4-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Mon Sep 17 2018 Robbie Harwood <rharwood@redhat.com> - 0.4-3
- Drop python2 subpackage
- Resolves: #1629775
+* Mon Nov 19 2018 Thomas Woerner <twoerner@redhat.com> - 0.4-3
+- Bump release to be able to add python-kdcpoxy to the idm module
+  Resolves: RHBZ#1639332

 * Thu Aug 09 2018 Robbie Harwood <rharwood@redhat.com> - 0.4-2
 - Update dependencies in test suite
--- a/gating.yaml
+++ b/gating.yaml
@ -1,7 +0,0 @@
-# recipients: abokovoy, frenaud, kaleem, ftrivino, cheimes
--- !Policy
-product_versions:
-  - rhel-10
-decision_context: osci_compose_gate
-rules:
-  - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}
--- a/1
+++ b/1
@ -1 +0,0 @@
-SHA512 (kdcproxy-1.0.0.tar.gz) = 617dba929d1c87c60d9a321269fd23348af11eabd8db3cea4b4750ec9514c9dce3487e658c396a5d009c9ef92326d45f5f00a2a116ab6469c62eda8270e55391
--- a/tests/tests.yml
+++ b/tests/tests.yml
@ -1,27 +0,0 @@
---
- hosts: localhost
-  tags:
-    - classic
-  pre_tasks:
-  - name: Enable CRB for python3-pytest on 1minutetip
-    ini_file:
-      path: /etc/yum.repos.d/rhel.repo
-      section: rhel-CRB
-      option: enabled
-      value: "1"
-      create: no
-    ignore_errors: yes
-  roles:
-  - role: standard-test-source
-    required_packages:
-      - git
-  - role: standard-test-basic
-    required_packages:
-      - python3-kdcproxy
-      - python3-pytest
-    tests:
-      - unittests:
-          dir: "source"
-          run: >-
-            rm -rf kdcproxy* &&
-            python3 -m pytest
				`@ -0,0 +1 @@`
				`48cffec358fe9e15a66fb040b6b7fc87f642f6da SOURCES/kdcproxy-0.4.tar.gz`
				`@ -1 +0,0 @@`
				`SHA512 (kdcproxy-1.0.0.tar.gz) = 617dba929d1c87c60d9a321269fd23348af11eabd8db3cea4b4750ec9514c9dce3487e658c396a5d009c9ef92326d45f5f00a2a116ab6469c62eda8270e55391`