Skip to content
This repository is currently being migrated. It's locked while the migration is in progress.

VII 114 automate test and build #1

Open
veselosky wants to merge 7 commits into
base: master
Choose a base branch
from
Open

VII 114 automate test and build #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4e0a208
Narrow tox matrix to currently supported versions
veselosky Feb 10, 2022
b5700c7
PEP8 fixes and gitignore update
veselosky Feb 10, 2022
7202782
Update test project for Django 3.2 compatibility
veselosky Feb 10, 2022
4738b41
Bug fix for deprecated selenium method
veselosky Feb 10, 2022
6dd7917
Update test matrix to currently supported versions
veselosky Feb 10, 2022
08f218c
Add Github workflows
veselosky Feb 10, 2022
6868e29
Bump version to 3.0 as only supporting Python 3
veselosky Feb 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 36 additions & 0 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
name: Release

on:
push:
tags:
- "*"

jobs:
release:
runs-on: ubuntu-18.04
steps:
- name: Checkout
uses: actions/checkout@v2
- name: Set up Python
uses: actions/setup-python@v2
with:
python-version: 3.8
- name: Install build packages
run: python -m pip install -U build
- name: Build packages
run: python -m build
- name: Create Release
uses: softprops/action-gh-release@v1
with:
files: |
dist/*.tar.gz
dist/*.whl
- name: Install system pkgs
run: sudo apt-get update && sudo apt-get install awscli
- name: Upload to S3
env:
AWS_DEFAULT_REGION: ${{ secrets.AWS_DEFAULT_REGION }}
AWS_PACKAGE_BUCKET: ${{ secrets.AWS_PACKAGE_BUCKET }}
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
run: for F in dist/*; do /usr/bin/aws s3 cp ${F} s3://${AWS_PACKAGE_BUCKET}/python/ ; done
22 changes: 22 additions & 0 deletions .github/workflows/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
name: Run Tests

on: [push, pull_request]

jobs:
test:
strategy:
matrix:
python: ['3.6', '3.8']
platform: [ubuntu-18.04]
runs-on: ${{ matrix.platform }}
steps:
- name: Checkout
uses: actions/checkout@v2
- name: Set up Python ${{ matrix.python }}
uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python }}
- name: Install test dependencies
run: sudo apt-get update && sudo apt-get install firefox-geckodriver && python -m pip install -U tox tox-gh-actions
- name: Test
run: python -m tox
166 changes: 158 additions & 8 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,159 @@
*.pyc
django_session_security.egg-info

# Created by https://www.toptal.com/developers/gitignore/api/python
# Edit at https://www.toptal.com/developers/gitignore?templates=python

### Python ###
# Byte-compiled / optimized / DLL files
__pycache__/
*.py[cod]
*$py.class

# C extensions
*.so

# Distribution / packaging
.Python
build/
develop-eggs/
dist/
downloads/
eggs/
.eggs/
lib/
lib64/
parts/
sdist/
var/
wheels/
share/python-wheels/
*.egg-info/
.installed.cfg
*.egg
MANIFEST

# PyInstaller
# Usually these files are written by a python script from a template
# before PyInstaller builds the exe, so as to inject date/other infos into it.
*.manifest
*.spec

# Installer logs
pip-log.txt
pip-delete-this-directory.txt

# Unit test / coverage reports
htmlcov/
.tox/
.nox/
.coverage
.coverage.*
.cache
nosetests.xml
coverage.xml
*.cover
*.py,cover
.hypothesis/
.pytest_cache/
cover/

# Translations
*.mo
*.pot

# Django stuff:
*.log
local_settings.py
db.sqlite3
db.sqlite3-journal

# Flask stuff:
instance/
.webassets-cache

# Scrapy stuff:
.scrapy

# Sphinx documentation
docs/_build/

# PyBuilder
.pybuilder/
target/

# Jupyter Notebook
.ipynb_checkpoints

# IPython
profile_default/
ipython_config.py

# pyenv
# For a library or package, you might want to ignore these files since the code is
# intended to run in multiple environments; otherwise, check them in:
# .python-version

# pipenv
# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
# However, in case of collaboration, if having platform-specific dependencies or dependencies
# having no cross-platform support, pipenv may install dependencies that don't work, or not
# install all needed dependencies.
#Pipfile.lock

# poetry
# Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control.
# This is especially recommended for binary packages to ensure reproducibility, and is more
# commonly ignored for libraries.
# https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control
#poetry.lock

# PEP 582; used by e.g. github.com/David-OConnor/pyflow
__pypackages__/

# Celery stuff
celerybeat-schedule
celerybeat.pid

# SageMath parsed files
*.sage.py

# Environments
.env
.venv
env/
venv/
ENV/
env.bak/
venv.bak/

# Spyder project settings
.spyderproject
.spyproject

# Rope project settings
.ropeproject
.idea
dist
docs/build
docs/source/_static/
test_project/geckodriver.log
db.sqlite

# mkdocs documentation
/site

# mypy
.mypy_cache/
.dmypy.json
dmypy.json

# Pyre type checker
.pyre/

# pytype static type analyzer
.pytype/

# Cython debug symbols
cython_debug/

# PyCharm
# JetBrains specific template is maintainted in a separate JetBrains.gitignore that can
# be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
# and can be added to the global gitignore or merged into this file. For a more nuclear
# option (not recommended) you can uncomment the following to ignore the entire idea folder.
#.idea/

# End of https://www.toptal.com/developers/gitignore/api/python
21 changes: 12 additions & 9 deletions session_security/middleware.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,10 @@

import django
from django.contrib.auth import logout
try: # Django 2.0

try: # Django 2.0
from django.urls import reverse, resolve, Resolver404
except: # Django < 2.0
except ImportError: # Django < 2.0
from django.core.urlresolvers import reverse, resolve, Resolver404

try:
Expand All @@ -35,7 +36,7 @@ class SessionSecurityMiddleware(MiddlewareMixin):
"""

def is_passive_request(self, request):
""" Should we skip activity update on this URL/View. """
"""Should we skip activity update on this URL/View."""
if request.path in PASSIVE_URLS:
return True

Expand All @@ -54,8 +55,8 @@ def get_expire_seconds(self, request):
return EXPIRE_AFTER

def process_request(self, request):
""" Update last activity time or logout. """
"""Update last activity time or logout."""

if django.VERSION < (1, 10):
is_authenticated = request.user.is_authenticated()
else:
Expand All @@ -65,16 +66,18 @@ def process_request(self, request):
return

now = datetime.now()
if '_session_security' not in request.session:
if "_session_security" not in request.session:
set_last_activity(request.session, now)
return

delta = now - get_last_activity(request.session)
expire_seconds = self.get_expire_seconds(request)
if delta >= timedelta(seconds=expire_seconds):
logout(request)
elif (request.path == reverse('session_security_ping') and
'idleFor' in request.GET):
elif (
request.path == reverse("session_security_ping")
and "idleFor" in request.GET
):
self.update_last_activity(request, now)
elif not self.is_passive_request(request):
set_last_activity(request.session, now)
Expand All @@ -90,7 +93,7 @@ def update_last_activity(self, request, now):

# Gracefully ignore non-integer values
try:
client_idle_for = int(request.GET['idleFor'])
client_idle_for = int(request.GET["idleFor"])
except ValueError:
return

Expand Down
12 changes: 6 additions & 6 deletions session_security/tests/project/urls.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import time

from django.conf.urls import include, url
from django.urls import include, re_path

try:
from django.conf.urls import patterns
Expand All @@ -21,12 +21,12 @@ def get(self, request, *args, **kwargs):


urlpatterns = [
url(r'^$', generic.TemplateView.as_view(template_name='home.html')),
url(r'^sleep/$', login_required(
re_path(r'^$', generic.TemplateView.as_view(template_name='home.html')),
re_path(r'^sleep/$', login_required(
SleepView.as_view(template_name='home.html')), name='sleep'),
url(r'^admin/', admin.site.urls),
url(r'session_security/', include('session_security.urls')),
url(r'^ignore/$', login_required(
re_path(r'^admin/', admin.site.urls),
re_path(r'session_security/', include('session_security.urls')),
re_path(r'^ignore/$', login_required(
generic.TemplateView.as_view(template_name='home.html')), name='ignore'),
]

Expand Down
23 changes: 13 additions & 10 deletions session_security/tests/test_base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

from selenium.webdriver.common.keys import Keys
from selenium.webdriver.common.action_chains import ActionChains
from selenium import webdriver;
from selenium import webdriver
from selenium.webdriver.firefox.webdriver import WebDriver
from selenium.webdriver import Remote
from django.contrib.staticfiles.testing import StaticLiveServerTestCase
Expand All @@ -17,7 +17,7 @@
from session_security.settings import WARN_AFTER, EXPIRE_AFTER


WAIT_TIME = 5 if not os.environ.get('CI', False) else 30
WAIT_TIME = 5 if not os.environ.get("CI", False) else 30


class SettingsMixin(object):
Expand All @@ -30,10 +30,11 @@ def setUp(self):
super(SettingsMixin, self).setUp()


class BaseLiveServerTestCase(SettingsMixin, StaticLiveServerTestCase,
LiveServerTestCase):
class BaseLiveServerTestCase(
SettingsMixin, StaticLiveServerTestCase, LiveServerTestCase
):

fixtures = ['session_security_test_user']
fixtures = ["session_security_test_user"]

def setUp(self):
SettingsMixin.setUp(self)
Expand All @@ -42,18 +43,20 @@ def setUp(self):
options = FirefoxOptions()
options.add_argument("--headless")
super(LiveServerTestCase, self).setUp()
self.sel= webdriver.Firefox(options=options)
self.sel.get('%s%s' % (self.live_server_url, '/admin/'))
self.sel.find_element_by_name('username').send_keys('test')
self.sel.find_element_by_name('password').send_keys('test')
self.sel = webdriver.Firefox(options=options)
self.sel.get("%s%s" % (self.live_server_url, "/admin/"))
self.sel.find_element_by_name("username").send_keys("test")
self.sel.find_element_by_name("password").send_keys("test")
self.sel.find_element_by_xpath('//input[@value="Log in"]').click()
self.sel.execute_script('window.open("/admin/", "other")')

def press_space(self):
body = self.sel.find_element_by_tag_name("body")
body.send_keys(Keys.SPACE)

def tearDown(self):
self.sel.quit()

@classmethod
def tearDownClass(cls):
super(BaseLiveServerTestCase, cls).tearDownClass()
super(BaseLiveServerTestCase, cls).tearDownClass()
Loading