Skip to content

Commit

Permalink
Merge pull request #11 from Martlark/1.1.1
Browse files Browse the repository at this point in the history
1.1.1
  • Loading branch information
Martlark authored Aug 13, 2020
2 parents cb69ecb + 2fb604e commit 882a254
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 6 deletions.
3 changes: 2 additions & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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
---------
Expand Down
2 changes: 1 addition & 1 deletion flask_ipban/ip_ban.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
3 changes: 2 additions & 1 deletion flask_ipban/nuisance.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ regex:
- .*\.bak$
- .*\.cfm$
- .*\.cf$
- .*\.cfg$
- .*\.cgi$
- .*\.cobolt$
- .*\.conf$
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions pypar.commands.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
5 changes: 4 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,10 @@
# limitations under the License.

from codecs import open

from setuptools import setup

VERSION = '1.1.0'
VERSION = '1.1.1'
LONG_DESCRIPTION = open('README.rst', 'r', encoding='utf-8').read()

setup(
Expand Down Expand Up @@ -53,6 +54,8 @@
'Operating System :: MacOS',
'Operating System :: Unix',
'Operating System :: Microsoft :: Windows',

'Framework :: Flask',
],
keywords='flask security spam url ban',

Expand Down

0 comments on commit 882a254

Please sign in to comment.