Merge pull request #15 from druuu/mods

django 1.11.1 version upgrade

Author: ashwin31

dockit/management/commands/ncp.py

@@ -6,19 +6,19 @@
 from dockit.models import User, Container
 
 class Command(BaseCommand):
-    option_list = BaseCommand.option_list + (make_option('--container_id', action='store', \
-            dest='container_id'), make_option('--sessionid', action='store', dest='sessionid'))
+    def add_arguments(self, parser):
+        parser.add_argument('container_id', nargs='+', type=str)
+        parser.add_argument('sessionid', nargs='+', type=str)
 
     def handle(self, *args, **options):
         try:
-            sessionid = options['sessionid'].rstrip()
+            sessionid = options['sessionid'][0].rstrip()
             session = Session.objects.get(session_key=str(sessionid))
             uid = session.get_decoded().get('_auth_user_id')
             user = User.objects.get(id=uid)
-            container = Container.objects.get(container_id=options['container_id'])
-        except ObjectDoesNotExist:
-            #raise HttpResponseForbidden
-            pass
+            container = Container.objects.get(container_id=options['container_id'][0])
+        except ObjectDoesNotExist as e:
+            raise HttpResponseForbidden
         else:
             if user.is_superuser or container.user == user:
                 pass

dockit/terminal

@@ -28,7 +28,7 @@ var container_id = os.Args[4]
 var port = flag.String("port", go_server_port, "Port for server")
 var host = flag.String("host", host_ip_addr+":"+host_port, "Docker host")
 
-var sid_regex = regexp.MustCompile(`.*sessionid=(?P<sessionid>.*)\n.*`)
+var sid_regex = regexp.MustCompile(`.*sessionid=(.*?)\n.*`)
 
 func main() {
 	flag.Parse()
@@ -47,7 +47,7 @@ func mid(next websocket.Handler) http.Handler {
         }
         sid_find := sid_regex.FindStringSubmatch(string(requestDump))
         sid := sid_find[1]
-        auth_out, auth_err := exec.Command("/bin/sh", "-c", "./manage.py ncp --container_id "+container_id+" --sessionid "+sid).Output()
+        auth_out, auth_err := exec.Command("python", "manage.py",  "ncp", container_id, sid).Output()
         if auth_err != nil {
             fmt.Printf("%s", auth_err)
             os.Exit(3)

dockit/terminal.go

@@ -1,35 +1,28 @@
-Sphinx==1.5.3
-six==1.10.0
 alabaster==0.7.9
-snowballstemmer==1.2.1
-imagesize==0.7.1
-docutils==0.13.1
-Pygments==2.1.3
+amqp==1.4.9
+anyjson==0.3.3
+appdirs==1.4.3
 Babel==2.3.4
-pytz==2016.6.1
-Jinja2==2.9.5
-MarkupSafe==0.23
-
-python-dateutil==2.5.3
-#six==1.10.0
-
-django-celery==3.1.17
-celery==3.1.23
-kombu==3.0.35
 billiard==3.3.0.23
-
+celery==3.1.23
+Django==1.11.1
+django-celery==3.1.17
 django-simple-pagination==1.1.4
-Django==1.9.2
-
+docutils==0.13.1
+imagesize==0.7.1
+Jinja2==2.9.5
+kombu==3.0.35
 lazy-object-proxy==1.2.2
-
-pyparsing==2.1.10
-
+MarkupSafe==0.23
+packaging==16.8
 psutil==4.3.1
-
 pydocstyle==1.0.0
-
-
+Pygments==2.1.3
+pyparsing==2.1.10
+python-dateutil==2.5.3
+pytz==2017.2
 requests==2.11.1
-
+six==1.10.0
+snowballstemmer==1.2.1
+Sphinx==1.5.3
 wrapt==1.10.8