Commit c7cf91db by Scott Duckworth

Merge branch 'release/2.3.1'

parents 05244d65 cd23df6b
===============================
Release Notes for django-sshkey
===============================
2.3.1 (2014-07-29)
------------------
* Add support for Django 1.6
* Add missing dependency for pyasn1 (introduced in 2.3.0)
* Add release notes (this file)
2.3.0 (2014-07-07)
------------------
* Schema change (label 0002): add last_used timestamp
* Provide {key_id} in template for SSHKEY_AUTHORIZED_KEYS_OPTIONS so that
last_used timestamp may be updated
* Add support for RFC4716 and PEM public keys for import and export
* django-sshkey-lookup can now use any method to lookup keys: all, by username,
by fingerprint, or compatibility mode
* Add ability to send email to user when a key is added to their account
* Add the following settings
* SSHKEY_ALLOW_EDIT
* SSHKEY_EMAIL_ADD_KEY
* SSHKEY_EMAIL_ADD_KEY_SUBJECT
* SSHKEY_FROM_EMAIL
* SSHKEY_SEND_HTML_EMAIL
* Remove setting SSHKEY_AUTHORIZED_KEYS_COMMAND (deprecated since 1.0.0)
* Fix up example templates
2.2.0 (2014-03-26)
------------------
* Change license to BSD 3-clause
* Basic compatability with Django > 1.3
* OpenSSH patch removed, refer to their separate projects
* Remove deprecated sshkey_authorized_keys_command management command
* Add the following lookup commands
* django-sshkey-lookup-all
* django-sshkey-lookup-by-fingerprint
* django-sshkey-lookup-by-username
2.1.0 (2014-01-22)
------------------
* lookup.sh and lookup.py deprecated in favor of django-sshkey-lookup and
django-sshkey-pylookup, respectively
* Install scripts using setuptools
2.0.1 (2013-09-30)
------------------
* Add missing __init__.py
2.0.0 (2013-09-30)
------------------
* Rename sshkey to django_sshkey
1.1.1 (2013-09-03)
------------------
* Include management and migrations directories in setuptools
1.1.0 (2013-08-28)
------------------
* Schema change (label 0001): add created and last_modified timestamps
1.0.1 (2013-08-28)
------------------
* Add copyright info
1.0.0 (2013-08-28)
------------------
First release
...@@ -26,4 +26,4 @@ ...@@ -26,4 +26,4 @@
# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
__version__ = '2.3.0' __version__ = '2.3.1'
...@@ -26,13 +26,16 @@ ...@@ -26,13 +26,16 @@
# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
import datetime
from django.db import models from django.db import models
from django.contrib.auth.models import User from django.contrib.auth.models import User
from django.core.exceptions import ValidationError from django.core.exceptions import ValidationError
from django.db.models.signals import pre_save from django.db.models.signals import pre_save
from django.dispatch import receiver from django.dispatch import receiver
try:
from django.utils.timezone import now
except ImportError:
import datetime
now = datetime.datetime.now
from django_sshkey.util import PublicKeyParseError, pubkey_parse from django_sshkey.util import PublicKeyParseError, pubkey_parse
from django_sshkey import settings from django_sshkey import settings
...@@ -101,11 +104,11 @@ class UserKey(models.Model): ...@@ -101,11 +104,11 @@ class UserKey(models.Model):
def save(self, *args, **kwargs): def save(self, *args, **kwargs):
if kwargs.pop('update_last_modified', True): if kwargs.pop('update_last_modified', True):
self.last_modified = datetime.datetime.now() self.last_modified = now()
super(UserKey, self).save(*args, **kwargs) super(UserKey, self).save(*args, **kwargs)
def touch(self): def touch(self):
self.last_used = datetime.datetime.now() self.last_used = now()
self.save(update_last_modified=False) self.save(update_last_modified=False)
@receiver(pre_save, sender=UserKey) @receiver(pre_save, sender=UserKey)
......
...@@ -47,7 +47,7 @@ def lookup(request): ...@@ -47,7 +47,7 @@ def lookup(request):
payload = request.read() payload = request.read()
key = UserKey.objects.get(id=int(payload)) key = UserKey.objects.get(id=int(payload))
key.touch() key.touch()
return HttpResponse(str(key.last_used), mimetype='text/plain') return HttpResponse(str(key.last_used), content_type='text/plain')
try: try:
fingerprint = request.GET['fingerprint'] fingerprint = request.GET['fingerprint']
keys = UserKey.objects.filter(fingerprint=fingerprint) keys = UserKey.objects.filter(fingerprint=fingerprint)
...@@ -67,7 +67,7 @@ def lookup(request): ...@@ -67,7 +67,7 @@ def lookup(request):
else: else:
options = '' options = ''
response += options + key.key + '\n' response += options + key.key + '\n'
return HttpResponse(response, mimetype='text/plain') return HttpResponse(response, content_type='text/plain')
@login_required @login_required
@require_GET @require_GET
......
#!/usr/bin/env python
import os
import sys
if __name__ == "__main__":
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "testproject.settings")
from django.core.management import execute_from_command_line
execute_from_command_line(sys.argv)
...@@ -73,4 +73,7 @@ setup( ...@@ -73,4 +73,7 @@ setup(
'django-sshkey-pylookup-by-fingerprint = django_sshkey.util:lookup_by_fingerprint_main', 'django-sshkey-pylookup-by-fingerprint = django_sshkey.util:lookup_by_fingerprint_main',
], ],
}, },
install_requires = [
'pyasn1',
],
) )
../django_sshkey
\ No newline at end of file
#!/usr/bin/env python
from django.core.management import execute_manager
import imp
try:
imp.find_module('settings') # Assumed to be in the same directory.
except ImportError:
import sys
sys.stderr.write("Error: Can't find the file 'settings.py' in the directory containing %r. It appears you've customized things.\nYou'll have to run django-admin.py, passing it your settings module.\n" % __file__)
sys.exit(1)
import settings
if __name__ == "__main__":
execute_manager(settings)
# Django settings for testproject project. """
Django settings for testproject project.
For more information on this file, see
https://docs.djangoproject.com/en/1.6/topics/settings/
For the full list of settings and their values, see
https://docs.djangoproject.com/en/1.6/ref/settings/
"""
# Build paths inside the project like this: os.path.join(BASE_DIR, ...)
import os
BASE_DIR = os.path.dirname(os.path.dirname(__file__))
import getpass
import socket
# Quick-start development settings - unsuitable for production
# See https://docs.djangoproject.com/en/1.6/howto/deployment/checklist/
# SECURITY WARNING: keep the secret key used in production secret!
SECRET_KEY = 'x+)6$acui@od5*0#a=9hnl%0slszm2r!jh5o8i8un-hh!0310$'
# SECURITY WARNING: don't run with debug turned on in production!
DEBUG = True DEBUG = True
TEMPLATE_DEBUG = DEBUG
DEFAULT_FROM_EMAIL = '%s@%s' % (getpass.getuser(), socket.gethostname()) TEMPLATE_DEBUG = True
ALLOWED_HOSTS = []
# Application definition
INSTALLED_APPS = (
'django.contrib.admin',
'django.contrib.auth',
'django.contrib.contenttypes',
'django.contrib.sessions',
'django.contrib.messages',
'django.contrib.staticfiles',
'south',
'django_sshkey',
)
ADMINS = ( MIDDLEWARE_CLASSES = (
# ('Your Name', 'your_email@example.com'), 'django.contrib.sessions.middleware.SessionMiddleware',
'django.middleware.common.CommonMiddleware',
'django.middleware.csrf.CsrfViewMiddleware',
'django.contrib.auth.middleware.AuthenticationMiddleware',
'django.contrib.messages.middleware.MessageMiddleware',
) )
MANAGERS = ADMINS ROOT_URLCONF = 'testproject.urls'
WSGI_APPLICATION = 'testproject.wsgi.application'
# Database
# https://docs.djangoproject.com/en/1.6/ref/settings/#databases
DATABASES = { DATABASES = {
'default': { 'default': {
'ENGINE': 'django.db.backends.sqlite3', # Add 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'. 'ENGINE': 'django.db.backends.sqlite3',
'NAME': 'test.db', # Or path to database file if using sqlite3. 'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),
'USER': '', # Not used with sqlite3.
'PASSWORD': '', # Not used with sqlite3.
'HOST': '', # Set to empty string for localhost. Not used with sqlite3.
'PORT': '', # Set to empty string for default. Not used with sqlite3.
} }
} }
# Hosts/domain names that are valid for this site; required if DEBUG is False # Internationalization
# See https://docs.djangoproject.com/en/{{ docs_version }}/ref/settings/#allowed-hosts # https://docs.djangoproject.com/en/1.6/topics/i18n/
ALLOWED_HOSTS = []
# Local time zone for this installation. Choices can be found here:
# http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
# although not all choices may be available on all operating systems.
# On Unix systems, a value of None will cause Django to use the same
# timezone as the operating system.
# If running in a Windows environment this must be set to the same as your
# system time zone.
TIME_ZONE = 'America/New_York'
# Language code for this installation. All choices can be found here:
# http://www.i18nguy.com/unicode/language-identifiers.html
LANGUAGE_CODE = 'en-us' LANGUAGE_CODE = 'en-us'
SITE_ID = 1 TIME_ZONE = 'UTC'
# If you set this to False, Django will make some optimizations so as not
# to load the internationalization machinery.
USE_I18N = True USE_I18N = True
# If you set this to False, Django will not format dates, numbers and
# calendars according to the current locale
USE_L10N = True USE_L10N = True
# Absolute filesystem path to the directory that will hold user-uploaded files. USE_TZ = True
# Example: "/home/media/media.lawrence.com/media/"
MEDIA_ROOT = ''
# URL that handles the media served from MEDIA_ROOT. Make sure to use a
# trailing slash.
# Examples: "http://media.lawrence.com/media/", "http://example.com/media/"
MEDIA_URL = ''
# Absolute path to the directory static files should be collected to. # Static files (CSS, JavaScript, Images)
# Don't put anything in this directory yourself; store your static files # https://docs.djangoproject.com/en/1.6/howto/static-files/
# in apps' "static/" subdirectories and in STATICFILES_DIRS.
# Example: "/home/media/media.lawrence.com/static/"
STATIC_ROOT = ''
# URL prefix for static files.
# Example: "http://media.lawrence.com/static/"
STATIC_URL = '/static/' STATIC_URL = '/static/'
# URL prefix for admin static files -- CSS, JavaScript and images.
# Make sure to use a trailing slash.
# Examples: "http://foo.com/static/admin/", "/static/admin/".
ADMIN_MEDIA_PREFIX = '/static/admin/'
# Additional locations of static files
STATICFILES_DIRS = (
# Put strings here, like "/home/html/static" or "C:/www/django/static".
# Always use forward slashes, even on Windows.
# Don't forget to use absolute paths, not relative paths.
)
# List of finder classes that know how to find static files in
# various locations.
STATICFILES_FINDERS = (
'django.contrib.staticfiles.finders.FileSystemFinder',
'django.contrib.staticfiles.finders.AppDirectoriesFinder',
# 'django.contrib.staticfiles.finders.DefaultStorageFinder',
)
# Make this unique, and don't share it with anybody.
SECRET_KEY = '^t!$t$&%g!dzo!2ig40v1tgk95$ed^i&h7w(ydg&adkdkc8wvn'
# List of callables that know how to import templates from various sources.
TEMPLATE_LOADERS = (
'django.template.loaders.filesystem.Loader',
'django.template.loaders.app_directories.Loader',
# 'django.template.loaders.eggs.Loader',
)
MIDDLEWARE_CLASSES = (
'django.middleware.common.CommonMiddleware',
'django.contrib.sessions.middleware.SessionMiddleware',
'django.middleware.csrf.CsrfViewMiddleware',
'django.contrib.auth.middleware.AuthenticationMiddleware',
'django.contrib.messages.middleware.MessageMiddleware',
)
ROOT_URLCONF = 'testproject.urls'
TEMPLATE_DIRS = ( TEMPLATE_DIRS = (
# Put strings here, like "/home/html/django_templates" or "C:/www/django/templates". os.path.join(BASE_DIR, 'testproject', 'templates'),
# Always use forward slashes, even on Windows.
# Don't forget to use absolute paths, not relative paths.
'templates',
) )
INSTALLED_APPS = ( import getpass
'django.contrib.auth', import socket
'django.contrib.contenttypes', DEFAULT_FROM_EMAIL = '%s@%s' % (getpass.getuser(), socket.gethostname())
'django.contrib.sessions', EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'
'django.contrib.sites',
'django.contrib.messages',
'django.contrib.staticfiles',
'django.contrib.admin',
'django.contrib.admindocs',
'south',
'django_sshkey',
)
# A sample logging configuration. The only tangible logging
# performed by this configuration is to send an email to
# the site admins on every HTTP 500 error.
# See http://docs.djangoproject.com/en/dev/topics/logging for
# more details on how to customize your logging configuration.
LOGGING = {
'version': 1,
'disable_existing_loggers': False,
'handlers': {
'mail_admins': {
'level': 'ERROR',
'class': 'django.utils.log.AdminEmailHandler'
}
},
'loggers': {
'django.request': {
'handlers': ['mail_admins'],
'level': 'ERROR',
'propagate': True,
},
}
}
from django.conf.urls.defaults import patterns, include, url try:
from django.conf.urls import patterns, include, url
except ImportError:
from django.conf.urls.defaults import patterns, include, url
from django.contrib import admin from django.contrib import admin
admin.autodiscover() admin.autodiscover()
urlpatterns = patterns('', urlpatterns = patterns('',
url(r'^', include('django_sshkey.urls')), url(r'^', include('django_sshkey.urls')),
url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
url(r'^admin/', include(admin.site.urls)), url(r'^admin/', include(admin.site.urls)),
) )
"""
WSGI config for testproject project.
It exposes the WSGI callable as a module-level variable named ``application``.
For more information on this file, see
https://docs.djangoproject.com/en/1.6/howto/deployment/wsgi/
"""
import os
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "testproject.settings")
from django.core.wsgi import get_wsgi_application
application = get_wsgi_application()
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment