From nobody Mon Apr 29 04:11:49 2024 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VSVJk1x4Fz5J9Vq; Mon, 29 Apr 2024 04:11:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VSVJj4NK1z40My; Mon, 29 Apr 2024 04:11:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714363909; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uyy5uNx2ylIYOelRfVjjHh0ZUeAUvRoXVFVDKp9bRZ8=; b=XYytOsqb3poSuJ0vSyN14FMZvst8OArB+XO/L9XV+paOCZOfLlDMqdDxP87Hr2gG1aJyZt LbJ5PsSqT6e68vgtl33bxgdXIf5ruXCOE+eHssOq6aUl3GvZpOBH4QtHhq2Fv+UBHJfSW2 XAN2vFPbKi+DRCHetD/huJJmOK/ooSI0wbXeDlK6n+YfKcLT78rxgpBDA5JI59MmoiDyC3 MYAKTUkhSvAhw78JO3Buhh59zdmZIl8EjO2UhN0IsihOeW+NpOByqiuBV3r8IlzgPhFYnV ECIQHWE8Bs6EeDVsfgr4VWw1L+uJv7/2fxUE6zVIByyuac3ZkoyBdDNIBdXhJQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714363909; a=rsa-sha256; cv=none; b=A718fu2e+dOrIwJChHrmZ6/Q0GvG0h6LiqXVSsSCznE9uwCumeFwuiEZPKv5KTW9HhyJT6 sJ9QkmDaOboeTP/hlzyATh/G7Z8uRpSEymWbT7OQkYM49aO3DsLwSF6X9Jkg52vOPPTu/G DG7af5E/RuEvChG6TLDzcQZNc2aeaFwRDPvJSz0OgYOYyvy0iSraDgMdGK2dYHxHdKHs/H n4nqQAlvF4TCfFU+SWR7Lui0olxLhpIOQdNHXp4mHzan+HRjApNtqmUj/a8L//PHtuHiyg udO5SK+/Uch5gHcdAZ2ZsYDJOUERplznSAj/4Ab23TYj6TNfNpL8tPW8tqT1bg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714363909; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uyy5uNx2ylIYOelRfVjjHh0ZUeAUvRoXVFVDKp9bRZ8=; b=G0a+n5PCquD2o65S3pMKLYWYks3YrVwVHSl9uNxHoBOf3mOh0EN3cGAKDnA/fkH+a8l1Xg mcCP2iGBc9l5U5BTK2zQwoeKCjhd6L+HIb8PqFD3zx4yKgs/gpAXhBg5gURJO5pjD1aL3h fXxv/9s3x4wWBrDXQXCiaCH45uY8G/ETOhEGvO/Ti3g/ihQLQnAkfC6weUQ7nLruO+TU3N 0yTghLjnra0kkfvdGkbuNKPFHQqtFUjksyVxgiG6hEYT5kdBxAHo/Zqb2ai9HbhrTQ4KqC Im9F4HHqCF6RrBPkacr63fRnVmFG0/LrxKNv6dlBVLiHypzYU+I3/8QkJxI7rw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VSVJj3zZZztkm; Mon, 29 Apr 2024 04:11:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43T4BnRe026467; Mon, 29 Apr 2024 04:11:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43T4BnYE026465; Mon, 29 Apr 2024 04:11:49 GMT (envelope-from git) Date: Mon, 29 Apr 2024 04:11:49 GMT Message-Id: <202404290411.43T4BnYE026465@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Li-Wen Hsu Subject: git: 188a62cbfecb - 2024Q2 - devel/py-python-bugzilla: Fix for API key leak List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-branches@freebsd.org Sender: owner-dev-commits-ports-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lwhsu X-Git-Repository: ports X-Git-Refname: refs/heads/2024Q2 X-Git-Reftype: branch X-Git-Commit: 188a62cbfecb9d70e4f6ab0ce419c681ffde80c1 Auto-Submitted: auto-generated The branch 2024Q2 has been updated by lwhsu: URL: https://cgit.FreeBSD.org/ports/commit/?id=188a62cbfecb9d70e4f6ab0ce419c681ffde80c1 commit 188a62cbfecb9d70e4f6ab0ce419c681ffde80c1 Author: Ricardo Branco AuthorDate: 2024-04-26 19:44:26 +0000 Commit: Li-Wen Hsu CommitDate: 2024-04-29 04:11:05 +0000 devel/py-python-bugzilla: Fix for API key leak Fixes https://github.com/python-bugzilla/python-bugzilla/issues/187 PR: 278612 MFH: 2024Q2 Pull Request: https://github.com/freebsd/freebsd-ports/pull/253 (cherry picked from commit e199513d74a5585e71a2aa278fc495f1ce3c41fe) --- devel/py-python-bugzilla/Makefile | 1 + .../files/patch-bugzilla___session.py | 23 ++++++++++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/devel/py-python-bugzilla/Makefile b/devel/py-python-bugzilla/Makefile index 42db2a632006..35eb957c3a9d 100644 --- a/devel/py-python-bugzilla/Makefile +++ b/devel/py-python-bugzilla/Makefile @@ -1,5 +1,6 @@ PORTNAME= python-bugzilla PORTVERSION= 3.2.0 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-python-bugzilla/files/patch-bugzilla___session.py b/devel/py-python-bugzilla/files/patch-bugzilla___session.py new file mode 100644 index 000000000000..bf9849a0eef2 --- /dev/null +++ b/devel/py-python-bugzilla/files/patch-bugzilla___session.py @@ -0,0 +1,23 @@ +--- bugzilla/_session.py ++++ bugzilla/_session.py +@@ -98,14 +98,14 @@ def request(self, *args, **kwargs): + if "timeout" not in kwargs: + kwargs["timeout"] = timeout + +- response = self._session.request(*args, **kwargs) ++ try: ++ response = self._session.request(*args, **kwargs) + +- if self._is_xmlrpc: +- # Yes this still appears to matter for properly decoding unicode +- # code points in bugzilla.redhat.com content +- response.encoding = "UTF-8" ++ if self._is_xmlrpc: ++ # This still appears to matter for properly decoding unicode ++ # code points in bugzilla.redhat.com content ++ response.encoding = "UTF-8" + +- try: + response.raise_for_status() + except requests.HTTPError as e: + # Scrape the api key out of the returned exception string