sync to master (ignore this)

.gitignore

@@ -10,14 +10,18 @@ dist/
 *.pyc
 *.pyo
 development.ini
+test.ini
 sideboard/docs
 plugins/*
 !plugins/conftest.py
 data/sessions/*
+data/profiler/*
 *-bootstrap.py
 data/*.db
 .tox
 node_modules/
+.cache
 distribute-*.tar.gz
 distribute_setup.py
-.eggs/
+.eggs/
+.coverage

.travis.yml

@@ -1,13 +1,27 @@
 language: python
-python: 2.7
-env:
-  - TOX_ENV=py27
-  - TOX_ENV=py33
-  - TOX_ENV=py34
+matrix:
+  include:
+    - python: "2.7"
+      env: TOX_ENV=pep8
+    - python: "2.7"
+      env: TOX_ENV=py27
+    - python: "3.3"
+      env: TOX_ENV=py33
+    - python: "3.4"
+      env: TOX_ENV=py34
+    - python: "3.5"
+      env: TOX_ENV=py35
+before_install:
+  - sudo apt-get -qq update
+  - sudo apt-get install -y build-essential libcap-dev
 install:
   - pip install tox
-  - pip install python-coveralls
+  - if [[ $TOX_ENV == py27 ]] || [[ $TOX_ENV == py35 ]]; then
+      pip install coveralls;
+    fi
 script:
   - tox -e $TOX_ENV
 after_success:
-  coveralls
+  - if [[ $TOX_ENV == py27 ]] || [[ $TOX_ENV == py35 ]]; then
+      coveralls;
+    fi

Dockerfile

@@ -1,38 +1,59 @@
-FROM python:3.4.3
+FROM python:3.4.5
 MAINTAINER RAMS Project "code@magfest.org"
 LABEL version.sideboard ="1.0"
-
 WORKDIR /app
 
-# verify gpg and sha256: http://nodejs.org/dist/v0.10.30/SHASUMS256.txt.asc
-# gpg: aka "Timothy J Fontaine (Work) <tj.fontaine@joyent.com>"
-# gpg: aka "Julien Gilli <jgilli@fastmail.fm>"
+# This is actually the least bad way to compose two Dockerfile tech stacks right now.
+# The following is copied and pasted from the Node Dockerfile at
+# https://github.com/nodejs/docker-node/blob/28425ed95cebaea2ff589c1516d79c60181983b2/7.4/Dockerfile
+# Update this comment and change the entire copypasta section to upgrade Node version
+
+#########################################
+# START NODEJS DOCKERFILE COPYPASTA     #
+# https://github.com/nodejs/docker-node #
+#########################################
+RUN groupadd --gid 1000 node \
+  && useradd --uid 1000 --gid node --shell /bin/bash --create-home node
+
+# gpg keys listed at https://github.com/nodejs/node#release-team
 RUN set -ex \
-	&& for key in \
-		7937DFD2AB06298B2293C3187D33FF9D0246406D \
-		114F43EE0176B71C7BC219DD50A3051F888C628D \
-	; do \
-		gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
-	done
-
-ENV NODE_VERSION 0.12.7
-ENV NPM_VERSION 2.14.1
-ENV BOWER_VERSION 1.5.2
-ENV GRUNT_VERSION 0.1.13
-
-RUN curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-x64.tar.gz" \
-	&& curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
-	&& gpg --verify SHASUMS256.txt.asc \
-	&& grep " node-v$NODE_VERSION-linux-x64.tar.gz\$" SHASUMS256.txt.asc | sha256sum -c - \
-	&& tar -xzf "node-v$NODE_VERSION-linux-x64.tar.gz" -C /usr/local --strip-components=1 \
-	&& rm "node-v$NODE_VERSION-linux-x64.tar.gz" SHASUMS256.txt.asc \
-	&& npm install -g npm@"$NPM_VERSION" \
-	&& npm install -g bower@"$BOWER_VERSION" grunt-cli@"$GRUNT_VERSION" \
-	&& echo '{ "allow_root": true }' > /root/.bowerrc \
-	&& npm cache clear
+  && for key in \
+    9554F04D7259F04124DE6B476D5A82AC7E37093B \
+    94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \
+    FD3A5288F042B6850C66B31F09FE44734EB7990E \
+    71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \
+    DD8F2338BAE7501E3DD5AC78C273792F7D83545D \
+    B9AE9905FFD7803F25714661B63B535A4C206CA9 \
+    C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
+    56730D5401028683275BD23C23EFEFE93C4CFFFE \
+  ; do \
+    gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" || \
+    gpg --keyserver pgp.mit.edu --recv-keys "$key" || \
+    gpg --keyserver keyserver.pgp.com --recv-keys "$key" ; \
+  done
+
+ENV NPM_CONFIG_LOGLEVEL info
+ENV NODE_VERSION 7.10.0
+
+RUN curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-x64.tar.xz" \
+  && curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
+  && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \
+  && grep " node-v$NODE_VERSION-linux-x64.tar.xz\$" SHASUMS256.txt | sha256sum -c - \
+  && tar -xJf "node-v$NODE_VERSION-linux-x64.tar.xz" -C /usr/local --strip-components=1 \
+  && rm "node-v$NODE_VERSION-linux-x64.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \
+  && ln -s /usr/local/bin/node /usr/local/bin/nodejs
+###################################
+# END NODEJS DOCKERFILE COPYPASTA #
+###################################
+
+# required for python-prctl
+RUN apt-get update && apt-get install -y libcap-dev && rm -rf /var/lib/apt/lists/*
 
 ADD . /app/
-RUN python3 setup.py develop
+RUN pip3 install virtualenv \
+  && virtualenv --always-copy /app/env \
+	&& /app/env/bin/pip3 install paver
+RUN /app/env/bin/paver install_deps
 
-CMD python3 /app/sideboard/run_server.py
+CMD /app/env/bin/python3 /app/sideboard/run_server.py
 EXPOSE 8282

README.md

@@ -1,4 +1,4 @@
-Sideboard [![Build Status](https://travis-ci.org/appliedsec/sideboard.svg)](https://travis-ci.org/appliedsec/sideboard)[![Coverage Status](https://coveralls.io/repos/appliedsec/sideboard/badge.png)](https://coveralls.io/r/appliedsec/sideboard)
+Sideboard [![Build Status](https://travis-ci.org/magfest/sideboard.svg)](https://travis-ci.org/magfest/sideboard) [![Coverage Status](https://coveralls.io/repos/github/magfest/sideboard/badge.svg?branch=master)](https://coveralls.io/github/magfest/sideboard?branch=master)
 =========
 
 Getting Started

data/paver/skeleton/__init__.py

@@ -1,4 +1,5 @@
 import os
+import re
 from datetime import datetime
 
 import six
@@ -9,25 +10,26 @@
 
 __here__ = os.path.dirname(os.path.abspath(__file__))
 
+
 def render(to_render, settings):
     if isinstance(to_render, six.string_types):
         return env.from_string(to_render).render(settings)
     else:
         with open(os.path.join(__here__, *to_render)) as template_file:
             return env.from_string(template_file.read()).render(settings)
 
+
 def create_plugin(plugins_dir, plugin, **settings):
     assert ' ' not in plugin, "plugins probably shouldn't have spaces; but either way we aren't specifically handling spaces"
     module = plugin.replace('-', '_')
     plugin = plugin.replace('_', '-')
     settings.update({'plugin': plugin, 'module': module, 'generated_date': datetime.utcnow()})
-    
+
     package_dir = os.path.join(plugins_dir, plugin)
     assert not os.path.exists(package_dir), '{} plugin already exists at {}'.format(plugin, package_dir)
     os.makedirs(os.path.join(package_dir, module, 'tests'))
     for fname, template in TEMPLATES.items():
         fname = render(fname, settings)
-
         if fname:
             fpath = os.path.join(package_dir, fname)
             try:
@@ -36,17 +38,19 @@ def create_plugin(plugins_dir, plugin, **settings):
                 pass
 
             with open(fpath, 'w') as f:
-                f.write(render(template, settings) + '\n')
+                # our templates often have a lot of {% if %} clauses which lead to a lot of blank lines,
+                # so we collapse those such that we never have more than 1 blank line in a row
+                f.write(re.sub(r'\n{3,}', '\n\n', render(template, settings).strip() + '\n'))
 
-    if settings.get('generate_sphinx', True):
+    if settings.get('sphinx', True):
         sphinx_settings = dict(
             path=os.path.join(package_dir, 'docs'),
             sep=False,
             dot='_',
             project=plugin,
             author='{} Team'.format(plugin),
-            release='0.1',
-            version='0.1',
+            release='0.1.0',
+            version='0.1.0',
             suffix='.rst',
             master='index',
             epub=False,
@@ -62,10 +66,8 @@ def create_plugin(plugins_dir, plugin, **settings):
             makefile=True,
             batchfile=False
         )
-
         sphinx.quickstart.generate(sphinx_settings)
 
-
 TEMPLATES = {
     '{{ module }}/_version.py': ('templates', '_version.py.template'),
     'requirements.txt': ('templates', 'requirements.txt.template'),

data/paver/skeleton/templates/__init__.py.template

@@ -1,8 +1,16 @@
-from __future__ import unicode_literals
-
-{% if webapp %}import cherrypy
+from __future__ import unicode_literals{% if django %}
+import os
+import sys
+{% endif %}
 
+{% if webapp or django %}
+import cherrypy
+{% if django %}
+import django
+from django.core.handlers.wsgi import WSGIHandler
+{% endif %}
 {% endif %}
+
 from sideboard.lib import log, parse_config{% if webapp %}, render_with_templates{% endif %}{% if service or sqlalchemy %}, services{% endif %}
 from {{ module }}._version import __version__
 
@@ -13,6 +21,7 @@ from {{ module }} import service
 services.register(service, '{{ module }}')
 
 {% endif %}
+
 {% if sqlalchemy %}
 from {{ module }} import sa
 services.register(sa.Session.crud, '{{ module }}_crud')
@@ -30,3 +39,23 @@ class Root(object):
 
 cherrypy.tree.mount(Root(), '/{{ module }}')
 {% endif %}
+
+{% if django %}
+# add our Django site to our Python path so we can import it
+sys.path.append(os.path.join(config['root'], '{{ django }}'))
+
+# since we're not using mod_wsgi we'll use the env var approach to setting up Django
+os.environ['DJANGO_SETTINGS_MODULE'] = '{{ django }}.settings'
+django.setup()
+cherrypy.tree.graft(WSGIHandler(), '/{{ django }}')
+
+# expose the static files used by the Django admin interface
+# NOTE: if you have Apache serving these files directly then you can remove this part
+class Static(object):
+    admin = cherrypy.tools.staticdir.handler(
+        section="/admin",
+        dir=os.path.dirname(django.__file__) + '/contrib/admin/static/admin'
+    )
+
+cherrypy.tree.mount(Static(), '/{{ django }}/static')
+{% endif %}

data/paver/skeleton/templates/_version.py.template

@@ -1,2 +1,3 @@
 from __future__ import unicode_literals
-__version__ = '0.1'
+
+__version__ = '0.1.0'

data/paver/skeleton/templates/fabfile.py.template

@@ -1,4 +1,5 @@
 from __future__ import unicode_literals
+import time
 from os.path import abspath, basename, dirname, join
 
 from sh import pip, fpm, chmod
@@ -12,24 +13,32 @@ POSTINSTALL = '/tmp/postinstall.sh'
 def _make_postinstall_script():
     with open(POSTINSTALL, 'w') as f:
         f.write('#!/bin/bash\n')
-        f.write('/opt/sideboard/bin/pip install --use-wheel --find-links /opt/sideboard/plugins/{package_name}/wheelhouse/ -r /opt/sideboard/plugins/{package_name}/requirements.txt'
+        f.write('set -e\n')
+        f.write('source /opt/sideboard/bin/activate && /opt/sideboard/bin/pip install --use-wheel --find-links /opt/sideboard/plugins/{package_name}/wheelhouse/ -r /opt/sideboard/plugins/{package_name}/requirements.txt\n'
                 .format(package_name=package_name))
+        f.write('chown -R sideboard.sideboard /opt/sideboard\n')
     chmod('755', POSTINSTALL)
 
-def package(package_type):
+def package(package_type, iteration='testing'):
     import sideboard
     plugin = __import__(plugin_name)
     pip('wheel', r='requirements.txt')
     _make_postinstall_script()
+    if iteration == 'testing':
+        iteration = '0.{}'.format(int(time.time()))
     fpm('-t', package_type,
         '-s', 'dir',
         '--{}-user'.format(package_type), 'sideboard',
         '--{}-group'.format(package_type), 'sideboard',
         '--name', 'sideboard-{}'.format(package_name),
         '--version', plugin.__version__,
+        '--license', 'COMPANY-PROPRIETARY',
+        '--iteration', iteration,
         '--depends', 'sideboard >= {}'.format(sideboard.__version__),
         '--after-install', POSTINSTALL,
+        '--config-files', '/etc/sideboard/plugins.d/{package_name}.cfg'.format(package_name=package_name),
         './package-support/{package_name}.cfg=/etc/sideboard/plugins.d/{package_name}.cfg'.format(package_name=package_name),
         './requirements.txt=/opt/sideboard/plugins/{}/requirements.txt'.format(package_name),
-        './wheelhouse=/opt/sideboard/plugins/{}'.format(package_name),
+        './wheelhouse=/opt/sideboard/plugins/{}'.format(package_name),{% if django %}
+        './{{ django }}=/opt/sideboard/plugins/{}/{{ django }}'.format(package_name),{% endif %}
         './{}=/opt/sideboard/plugins/{}'.format(plugin_name, package_name))

data/paver/skeleton/templates/index.html.template

@@ -1,9 +1,9 @@
-<!doctype html>
+{% raw %}<!doctype html>
 <html>
-    <head><title>$(( plugin ))$ skeleton page</title></head>
+    <head><title>{{ plugin }} skeleton page</title></head>
     <body>
-        ((% if header %))
-            <h1>Hello $(( plugin ))$ developer!</h1>
-        ((% endif %))
+        {% if header %}
+            <h1>Hello {{ plugin }} developer!</h1>
+        {% endif %}
     </body>
-</html>
+</html>{% endraw%}

development-defaults.ini

@@ -1,22 +1,11 @@
 
 debug = True
 ws.auth_required = False
-# set priority plugin so the main uber plugin always loads first
-priority_plugins = uber,
 
 [cherrypy]
 server.socket_host = "0.0.0.0"
 engine.autoreload.on = True
-tools.sessions.timeout = 4320  # 30 days (in minutes)
+
 
 [loggers]
 root = "DEBUG"
-
-[handlers]
-[[stdout]]
-class = "logging.StreamHandler"
-stream = "ext://sys.stderr"
-
-#[[syslog]]
-#class = "logging.handlers.SysLogHandler"
-#address = "/dev/log"