Merge branch 'master' of github.com:deis/controller into virtualenv-links

Author: Matt Tucker

Makefile

@@ -42,7 +42,7 @@ commit-hook:
 full-clean: check-docker
 	docker images -q $(IMAGE_PREFIX)$(COMPONENT) | xargs docker rmi -f
 
-postgres:
+postgres: check-docker
 	docker start postgres || docker run --restart="always" -d -p 5432:5432 --name postgres postgres:9.3
 	docker exec postgres createdb -U postgres deis 2>/dev/null || true
 	@echo "To use postgres for local development:"

README.md

@@ -50,24 +50,27 @@ helmc install workflow-dev
 
 ### Postgresql
 
-Postgresql can be installed via `homebrew`:
-
+The application and tests use PostgreSQL. To start a local instance via Docker, run `make postgres` and set the following in your shell:
 ```
-brew install postgresql
+  export PGHOST=`docker-machine ip $(docker-machine active) 2>/dev/null || echo 127.0.0.1`
+  export PGPORT=5432
+  export PGUSER=postgres
 ```
 
-Or via your package manager. For example, on Debian Jessie:
+### Python
+
+Python 3.5 is a minimum requirement and can be installed via `pyenv`:
 
 ```
-apt-get install postgresql libpq-dev
+brew install pyenv
 ```
 
-### Python
-
-Python 3.5 is a minimum requirement and can be installed via `homebrew`:
-
+- After installing, ensure [`eval "$(pyenv init -)"` is added to your shell startup.](https://github.com/yyuu/pyenv/#homebrew-on-mac-os-x)
+- Install and use Python 3.5:
 ```
-brew install python3
+pyenv install 3.5.0
+# if you have build issues, ensure Xcode CLI tools are installed:https://github.com/yyuu/pyenv/issues/451#issuecomment-151336786
+python local 3.5.0 # use Python 3.5.0 in your current directory
 ```
 
 Or via your package manager. For example, on Debian Jessie:

rootfs/api/permissions.py

@@ -2,7 +2,7 @@
 from rest_framework import exceptions
 from rest_framework import permissions
 from django.conf import settings
-from django.contrib.auth.models import AnonymousUser
+from django.contrib.auth.models import AnonymousUser, User
 
 from api import models
 
@@ -109,6 +109,8 @@ def has_permission(self, request, view):
             if settings.REGISTRATION_MODE == 'enabled':
                 return True
             elif settings.REGISTRATION_MODE == 'admin_only':
+                if not User.objects.filter(is_superuser=True).exists():
+                    return True
                 return request.user.is_superuser
             else:
                 raise Exception("{} is not a valid registation mode"

rootfs/api/tests/test_perm.py

@@ -1,5 +1,6 @@
 from django.contrib.auth.models import User
 from rest_framework.authtoken.models import Token
+from django.test.utils import override_settings
 from api.tests import DeisTestCase
 
 
@@ -32,6 +33,21 @@ def test_first_signup(self):
         self.assertEqual(response.status_code, 201, response.data)
         self.assertFalse(response.data['is_superuser'])
 
+    @override_settings(REGISTRATION_MODE="admin_only")
+    def test_first_signup_admin_only(self):
+        # register a first user
+        username, password = 'firstuser', 'password'
+        email = 'autotest@deis.io'
+        submit = {
+            'username': username,
+            'password': password,
+            'email': email,
+        }
+        url = '/v2/auth/register'
+        response = self.client.post(url, submit)
+        self.assertEqual(response.status_code, 201, response.data)
+        self.assertTrue(response.data['is_superuser'])
+
     def test_list(self):
         submit = {
             'username': 'firstuser',

rootfs/requirements.txt

@@ -4,14 +4,14 @@ Django==1.10.2
 django-cors-middleware==1.3.1
 django-guardian==1.4.6
 djangorestframework==3.4.7
-docker-py==1.10.3
+docker-py==1.10.4
 gunicorn==19.6.0
 jmespath==0.9.0
 jsonfield==1.0.3
 morph==0.1.2
 ndg-httpsclient==0.4.2
 psycopg2==2.6.2
-pyOpenSSL==16.1.0
+pyOpenSSL==16.2.0
 pytz==2016.7
 requests==2.11.1
 requests-toolbelt==0.7.0