Merge pull request #1496 from jzelinskie/ripRMS

dockerfile: add check for GPL pip packages

Dockerfile

@@ -1,22 +1,52 @@
 # vim:ft=dockerfile
 
-FROM phusion/baseimage:0.9.18
+FROM quay.io/jzelinskie/phusion-baseimage-xenial:e436d1c
 
 ENV DEBIAN_FRONTEND noninteractive
 ENV HOME /root
 
-# Install the dependencies.
+# Install system packages
-RUN apt-get update  # 07APR2016
+RUN apt-get update # 02JUN2016
+RUN apt-get install -y \
+     g++               \
+     gdebi-core        \
+     git               \
+     libevent-2.0.5    \
+     libevent-dev      \
+     libffi-dev        \
+     libfreetype6-dev  \
+     libgpgme11        \
+     libgpgme11-dev    \
+     libjpeg62         \
+     libjpeg62-dev     \
+     libjpeg8          \
+     libldap-2.4-2     \
+     libldap2-dev      \
+     libmagic1         \
+     libpq-dev         \
+     libpq5            \
+     libsasl2-dev      \
+     libsasl2-modules  \
+     nodejs            \
+     npm               \
+     phantomjs         \
+     python-dev        \
+     python-pip        \
+     python-virtualenv
 
-# New ubuntu packages should be added as their own apt-get install lines below the existing install commands
+# Install python dependencies
-RUN apt-get install -y git python-virtualenv python-dev libjpeg8 libjpeg62 libjpeg62-dev libevent-2.0.5 libevent-dev gdebi-core g++ libmagic1 phantomjs nodejs npm libldap-2.4-2 libldap2-dev libsasl2-modules libsasl2-dev libpq5 libpq-dev libfreetype6-dev libffi-dev libgpgme11 libgpgme11-dev
-
-# Build the python dependencies
 ADD requirements.txt requirements.txt
 RUN virtualenv --distribute venv
-RUN venv/bin/pip install -r requirements.txt # 01MAR2016
+RUN venv/bin/pip install -r requirements.txt # 02JUN2016
 RUN venv/bin/pip freeze
 
+# Check python dependencies for the GPL
+# Due to the following bug, pip results must be piped to a file before grepping:
+# https://github.com/pypa/pip/pull/3304
+RUN cat requirements.txt | grep -v "^-e" | awk -F'==' '{print $1}' | xargs venv/bin/pip --disable-pip-version-check show > pipinfo.txt &&
+    test -z $(cat pipinfo.txt | grep GPL | grep -v LGPL) &&
+    rm pipinfo.txt
+
 # Install the binary dependencies
 ADD binary_dependencies binary_dependencies
 RUN gdebi --n binary_dependencies/*.deb
@@ -26,13 +56,13 @@ RUN mkdir /gocode
 ENV GOPATH /gocode
 RUN curl -O https://storage.googleapis.com/golang/go1.6.linux-amd64.tar.gz && \
     tar -xvf go1.6.linux-amd64.tar.gz && \
-    sudo mv go /usr/local && \
+    mv go /usr/local && \
     rm -rf go1.6.linux-amd64.tar.gz && \
     /usr/local/go/bin/go get -u github.com/cloudflare/cfssl/cmd/cfssl && \
     /usr/local/go/bin/go get -u github.com/cloudflare/cfssl/cmd/cfssljson && \
-    sudo cp /gocode/bin/cfssljson /bin/cfssljson && \
+    cp /gocode/bin/cfssljson /bin/cfssljson && \
-    sudo cp /gocode/bin/cfssl /bin/cfssl && \
+    cp /gocode/bin/cfssl /bin/cfssl && \
-    sudo rm -rf /gocode && sudo rm -rf /usr/local/go
+    rm -rf /gocode && rm -rf /usr/local/go
 
 # Install jwtproxy
 RUN curl -L -o /usr/local/bin/jwtproxy https://github.com/coreos/jwtproxy/releases/download/v0.0.1/jwtproxy-linux-x64

endpoints/api/build.py

@@ -1,12 +1,13 @@
 """ Create, list, cancel and get status/logs of repository builds. """
 
+from urlparse import urlparse
+
 import logging
 import json
 import datetime
 import hashlib
 
 from flask import request
-from rfc3987 import parse as uri_parse
 
 from app import userfiles as user_files, build_logs, log_archive, dockerfile_build_queue
 from buildtrigger.basehandler import BuildTriggerHandler
@@ -229,14 +230,14 @@ class RepositoryBuildList(RepositoryParamResource):
     if archive_url:
       archive_match = None
       try:
-        archive_match = uri_parse(archive_url, 'URI')
+        archive_match = urlparse(archive_url)
       except ValueError:
         pass
 
       if not archive_match:
         raise InvalidRequest('Invalid Archive URL: Must be a valid URI')
 
-      scheme = archive_match.get('scheme', None)
+      scheme = archive_match.scheme
       if scheme != 'http' and scheme != 'https':
         raise InvalidRequest('Invalid Archive URL: Must be http or https')
 

requirements-nover.txt

@@ -54,7 +54,6 @@ Flask-Testing
 pyjwt
 toposort
 pyjwkest
-rfc3987
 jsonpath-rw
 bintrees
 redlock
@@ -63,4 +62,3 @@ bencode
 cryptography
 httmock
 moto
-timeparse

requirements.txt

@@ -101,14 +101,12 @@ reportlab==2.7
 requests==2.9.1
 requests-oauthlib==0.6.1
 -e git+https://github.com/coreos/resumablehashlib.git@b1b631249589b07adf40e0ee545b323a501340b4#egg=resumablehashlib
-rfc3987==1.3.5
 semantic-version==2.5.0
 six==1.10.0
 SQLAlchemy==1.0.12
 stevedore==1.12.0
 stringscore==0.1.0
 stripe==1.32.0
-timeparse==0.5.5
 toposort==1.4
 trollius==2.1
 tzlocal==1.2.2

test/test_api_usage.py

@@ -247,11 +247,11 @@ class TestDiscovery(ApiTestCase):
 
 
 class TestErrorDescription(ApiTestCase):
-    def test_get_error(self):
+  def test_get_error(self):
-        json = self.getJsonResponse(Error, params=dict(error_type='not_found'))
+    json = self.getJsonResponse(Error, params=dict(error_type='not_found'))
-        assert json['title'] == 'not_found'
+    assert json['title'] == 'not_found'
-        assert 'type' in json
+    assert 'type' in json
-        assert 'description' in json
+    assert 'description' in json
 
 
 class TestPlans(ApiTestCase):
@@ -455,9 +455,11 @@ class TestConvertToOrganization(ApiTestCase):
     self.assertEquals(True, json['is_admin'])
 
     # Verify the now-org has no permissions.
-    count = (database.RepositoryPermission.select()
+    count = (database
-                                          .where(database.RepositoryPermission.user == organization)
+             .RepositoryPermission
-                                          .count())
+             .select()
+             .where(database.RepositoryPermission.user == organization)
+             .count())
     self.assertEquals(0, count)
 
   def test_convert_via_email(self):
@@ -1814,6 +1816,15 @@ class TestGetRepository(ApiTestCase):
 
 
 class TestRepositoryBuildResource(ApiTestCase):
+
+  def test_repo_build_invalid_url(self):
+    self.login(ADMIN_ACCESS_USER)
+
+    self.postJsonResponse(RepositoryBuildList,
+                          params=dict(repository=ADMIN_ACCESS_USER + '/simple'),
+                          data=dict(archive_url='hppt://quay.io'),
+                          expected_code=400)
+
   def test_cancel_invalidbuild(self):
     self.login(ADMIN_ACCESS_USER)
 

util/generatepresharedkey.py

@@ -1,10 +1,12 @@
+import argparse
+
+from dateutil.parser import parse as parse_date
+
 from app import app
 from data import model
 from data.database import ServiceKeyApprovalType
 from data.model.log import log_action
-from timeparse import ParseDatetime
 
-import argparse
 
 def generate_key(service, name, expiration_date=None, notes=None):
   metadata = {
@@ -34,12 +36,20 @@ def generate_key(service, name, expiration_date=None, notes=None):
   return private_key, key.kid
 
 
+def valid_date(s):
+  try:
+    return parse_date(s)
+  except ValueError:
+    msg = "Not a valid date: '{0}'.".format(s)
+    raise argparse.ArgumentTypeError(msg)
+
+
 if __name__ == '__main__':
   parser = argparse.ArgumentParser(description='Generates a preshared key')
   parser.add_argument('service', help='The service name for which the key is being generated')
   parser.add_argument('name', help='The friendly name for the key')
-  parser.add_argument('--expiration', help='The optional expiration date/time for the key',
+  parser.add_argument('--expiration', default=None, type=valid_date,
-                      default=None, action=ParseDatetime)
+                      help='The optional expiration date for the key')
   parser.add_argument('--notes', help='Optional notes about the key', default=None)
 
   args = parser.parse_args()