From dc0650014d0c558fd4ee1744a0f81876e1fdda09 Mon Sep 17 00:00:00 2001 From: andrew rowe Date: Fri, 7 Aug 2020 13:00:49 +1000 Subject: [PATCH 1/2] 1.1.1 add to nuisance.yaml --- flask_ipban/nuisance.yaml | 3 ++- setup.py | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/flask_ipban/nuisance.yaml b/flask_ipban/nuisance.yaml index cabea1d..68440e3 100644 --- a/flask_ipban/nuisance.yaml +++ b/flask_ipban/nuisance.yaml @@ -34,6 +34,7 @@ regex: - .*\.bak$ - .*\.cfm$ - .*\.cf$ + - .*\.cfg$ - .*\.cgi$ - .*\.cobolt$ - .*\.conf$ @@ -79,10 +80,10 @@ regex: - \/web.config.txt$ - \+CSCOE\+/ - ^/joomla/ + - ^/\.git string: # all of these are hacking attempts by vulnerability scanners - - /.git/config - /_asterisk/ - /admin/assets/js/views/login.js - /admin/images/cal_date_over.gif diff --git a/setup.py b/setup.py index 4822de9..f0e9fd8 100644 --- a/setup.py +++ b/setup.py @@ -13,6 +13,7 @@ # limitations under the License. from codecs import open + from setuptools import setup VERSION = '1.1.0' @@ -53,6 +54,8 @@ 'Operating System :: MacOS', 'Operating System :: Unix', 'Operating System :: Microsoft :: Windows', + + 'Framework :: Flask', ], keywords='flask security spam url ban', From 2fb604e2bef0b0949f11eb81b81f210ff8205cf2 Mon Sep 17 00:00:00 2001 From: andrew rowe Date: Thu, 13 Aug 2020 15:32:14 +1000 Subject: [PATCH 2/2] 1.1.1 Fix typo. Boost version. --- README.rst | 3 ++- flask_ipban/ip_ban.py | 2 +- pypar.commands.sh | 4 ++-- setup.py | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/README.rst b/README.rst index d414bab..5b1219a 100644 --- a/README.rst +++ b/README.rst @@ -126,7 +126,7 @@ Example of ip_whitelist_add app = Flask(__name__) ip_ban = IpBan(app) - ip_ban.whitelist_add('127.0.0.1') + ip_ban.ip_whitelist_add('127.0.0.1') - ``load_nuisances(file_name=None)`` - add a list of nuisances to url pattern block list from a file. See below for more information. @@ -237,6 +237,7 @@ Release History 1.0.13 - Remove reason= which did nothing. Add url to report table. Add more nuisances. Add release history. 1.1.0 - Add more nuisances. Add ability to block regions by using `block_cidr()`. Remove support for obsolete Python releases (2.7,3.4,3.5). +1.1.1 - Fix doco typo. Licensing --------- diff --git a/flask_ipban/ip_ban.py b/flask_ipban/ip_ban.py index b2daa15..b5d720a 100644 --- a/flask_ipban/ip_ban.py +++ b/flask_ipban/ip_ban.py @@ -36,7 +36,7 @@ class IpBan: """ - VERSION = '1.1.0' + VERSION = '1.1.1' def __init__(self, app=None, ban_count=20, ban_seconds=3600 * 24, persist=False, record_dir=None, ipc=False, secret_key=None, ip_header=None, abuse_IPDB_config=None): diff --git a/pypar.commands.sh b/pypar.commands.sh index 7e347ad..2a67604 100644 --- a/pypar.commands.sh +++ b/pypar.commands.sh @@ -20,10 +20,10 @@ pip install twine python setup.py sdist bdist_wheel # -twine check dist/flask_ipban-1.1.0* +twine check dist/flask_ipban-1.1.1* # test # pip install -e . # twine upload --repository-url https://test.pypi.org/legacy/ dist/* -u martlark # prod pypi # add release in git hub to match the version -twine upload dist/flask_ipban-1.1.0* -u martlark +twine upload dist/flask_ipban-1.1.1* -u martlark diff --git a/setup.py b/setup.py index f0e9fd8..7c1748a 100644 --- a/setup.py +++ b/setup.py @@ -16,7 +16,7 @@ from setuptools import setup -VERSION = '1.1.0' +VERSION = '1.1.1' LONG_DESCRIPTION = open('README.rst', 'r', encoding='utf-8').read() setup(