Merge remote-tracking branch 'upstream/master' into market_listeners_tests

Author: Tom Galloway

.gitignore

@@ -59,3 +59,9 @@ target/
 
 .idea/
 _trial_temp/
+
+# Docker data
+data/
+
+# SSL
+ssl/

Dockerfile

@@ -1,23 +1,44 @@
-FROM ubuntu:14.04
-
-MAINTAINER Joshua Sindy <[email protected]>
-# Examples
-# docker build -t observer .
-# docker run --rm -it -e flags="--help" observer
-# docker run -d --name observer -e flags="--testnet" observer
-# docker logs observer
-
-RUN apt-get update
-RUN apt-get install -y python-dev python-pip build-essential git libffi-dev libssl-dev
-RUN pip install pyopenssl ndg-httpsclient pyasn1
-RUN pip install --upgrade pip virtualenv
-RUN pip install mock coverage nose pylint
+FROM ubuntu:15.04
+MAINTAINER eiabea <[email protected]>
+
+# Install required Debian packages
+RUN set -ex \
+  && echo "deb http://us.archive.ubuntu.com/ubuntu vivid main universe" | tee -a /etc/apt/sources.list \
+  && apt-get update -q \
+  && apt-get install -q -y build-essential libssl-dev libffi-dev python-dev openssl python-pip libzmq3-dev libsodium-dev autoconf automake pkg-config libtool git \
+  && apt-get clean autoclean -q -y \
+  && apt-get autoremove -q -y \
+  && rm -rf /var/lib/apt/lists/* /var/lib/apt/lists/partial/* /tmp/* /var/tmp/*
+
+# Install libzmq from github
+RUN git clone https://github.com/zeromq/libzmq
+WORKDIR /libzmq
+RUN ./autogen.sh
+RUN ./configure
+RUN make
+RUN make install
+RUN ldconfig
+
+# Install cryptography
+WORKDIR /
+RUN pip install cryptography
+
+# Install Openbazaar-Server from github
 RUN git clone https://github.com/OpenBazaar/OpenBazaar-Server.git
 WORKDIR /OpenBazaar-Server/
-RUN pip install -r requirements.txt && pip install -r test_requirements.txt
+RUN pip install -r requirements.txt -r test_requirements.txt
 RUN make
+
+# Copy entrypoint script and mark it executable
+COPY ./docker-entrypoint.sh /docker-entrypoint.sh
+RUN chmod +x /docker-entrypoint.sh
+
+# Create Openbazaar user and set correct permissions
 RUN adduser --disabled-password --gecos \"\" openbazaar
 RUN chown -R openbazaar:openbazaar /OpenBazaar-Server
 
-USER openbazaar
-CMD python openbazaard.py start $flags
+VOLUME /root/.openbazaar
+VOLUME /ssl
+
+ENTRYPOINT ["/docker-entrypoint.sh"]
+CMD ["python", "openbazaard.py", "start"]

Makefile

@@ -6,7 +6,7 @@ TESTPATH=./dht/tests ./db/tests ./market/tests
 all: check unittest
 
 unittest:
-	nosetests -vs --with-coverage --cover-package=dht --cover-package=db --cover-package=market --cover-inclusive $(TESTPATH)
+	nosetests -vs --with-doctest --with-coverage --cover-package=dht --cover-package=db --cover-package=market --cover-inclusive $(TESTPATH)
 
 check: pycheck
 

README.md

@@ -8,13 +8,14 @@ a Kademlia style DHT. Rest and websocket APIs are available for clients to commu
 
 Pre-built installers which bundle the client and server components can be found [here](https://github.com/OpenBazaar/OpenBazaar-Installer/releases).
 
+Depending on your system configuration you may need to install some additional dependencies. You can find more detailed, OS specific, instructions [here](https://slack-files.com/T02FPGBKB-F0KJU1CLX-cbbcf8a02c).
+
 To install just this server:
+
 ```bash
-pip install -r requirements.txt
+sudo pip install -r requirements.txt
 ```
 
-Depending on your system configuration you may need to install some additional dependencies. You can find more detailed, OS specific, instructions [here](https://slack-files.com/T02FPGBKB-F0KJU1CLX-cbbcf8a02c).
-
 ## Usage
 
 ```bash
@@ -45,5 +46,40 @@ optional arguments:
   --pidfile PIDFILE     name of the pid file
 ```
 
+## Docker
+
+- Install [Docker](https://docs.docker.com/engine/installation/).
+- Install [DockerCompose](https://docs.docker.com/compose/install/).
+
+#### Set Username and Password
+```bash
+nano ./docker-compose.yml
+```
+
+#### Build and run
+```bash
+docker-compose up
+```
+
+#### Backup
+All relevant data will go to
+```bash
+./data
+```
+
+#### SSL Support
+- Generate certificate as described [here](https://slack-files.com/T02FPGBKB-F0XK9ND2Q-fc5e6500a3)
+
+- Place the *server.crt* and *server.key* into
+```bash
+./ssl
+```
+
+- Enable SSL in
+```bash
+./docker-compose.yml
+```
+
+
 ## License
 OpenBazaar Server is licensed under the [MIT License](LICENSE).

api/__init__.py

@@ -1 +1,44 @@
 __author__ = 'chris'
+
+ALLOWED_TAGS = [
+    'a',
+    'b',
+    'blockquote',
+    'em',
+    'hr',
+    'h2',
+    'h3',
+    'h4',
+    'h5',
+    'i',
+    'img',
+    'li',
+    'p',
+    'ol',
+    'nl',
+    'span',
+    'strike',
+    'strong',
+    'ul',
+]
+ALLOWED_ATTRIBUTES = {
+    'a': ['href', 'title', 'alt', 'style'],
+    'img': ['src', 'width', 'height'],
+    'b': ['style'],
+    'blockquote': ['style'],
+    'em': ['style'],
+    'h2': ['style'],
+    'h3': ['style'],
+    'h4': ['style'],
+    'h5': ['style'],
+    'i': ['style'],
+    'li': ['style'],
+    'p': ['style'],
+    'ol': ['style'],
+    'nl': ['style'],
+    'span': ['style'],
+    'strike': ['style'],
+    'strong': ['style']
+}
+
+ALLOWED_STYLES = ['color', 'background']