Merge branch 'master' of https://github.com/OpenBazaar/OpenBazaar-Server

Author: cpacia

.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"]

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).

docker-compose.yml

@@ -0,0 +1,21 @@
+version: "2"
+
+services:
+  openbazaard:
+    build: "."
+    network_mode: "host"
+    ports:
+      - "18467:18467"
+      - "18469:18469/udp"
+      - "18466:18466"
+      - "18470:18470"
+    volumes:
+      - "./data:/root/.openbazaar"
+      - "./ssl:/ssl"
+    environment:
+        # Should be changed to more secure values
+      - "OB_USERNAME=username"
+      - "OB_PASSWORD=password"
+      - "OB_SSL=false"
+      - "OB_SSL_CERT=/ssl/server.crt"
+      - "OB_SSL_KEY=/ssl/server.key"

docker-entrypoint.sh

@@ -0,0 +1,48 @@
+#!/usr/bin/env bash
+
+set -e
+
+set_username() {
+	sedEscapedValue="$(echo "$1" | sed 's/[\/&]/\\&/g')"
+	sed -ri "s/^#?(USERNAME\s*=\s*)\S+/\1$sedEscapedValue/" "/OpenBazaar-Server/ob.cfg"
+}
+
+set_password() {
+	sedEscapedValue="$(echo "$1" | sed 's/[\/&]/\\&/g')"
+	sed -ri "s/^#?(PASSWORD\s*=\s*)\S+/\1$sedEscapedValue/" "/OpenBazaar-Server/ob.cfg"
+}
+
+set_ssl() {
+	sedEscapedValue="$(echo "$1" | sed 's/[\/&]/\\&/g')"
+	sed -ri "s/^#?(SSL\s*=\s*)\S+/\1$sedEscapedValue/" "/OpenBazaar-Server/ob.cfg"
+}
+
+set_ssl_cert() {
+	sedEscapedValue="$(echo "$1" | sed 's/[\/&]/\\&/g')"
+	sed -ri "s/^#?(SSL_CERT\s*=\s*)\S+/\1$sedEscapedValue/" "/OpenBazaar-Server/ob.cfg"
+}
+
+set_ssl_key() {
+	sedEscapedValue="$(echo "$1" | sed 's/[\/&]/\\&/g')"
+	sed -ri "s/^#?(SSL_KEY\s*=\s*)\S+/\1$sedEscapedValue/" "/OpenBazaar-Server/ob.cfg"
+}
+
+echo "Setting username"
+set_username $OB_USERNAME
+
+echo "Setting password"
+set_password $OB_PASSWORD
+
+if [ "$OB_SSL" = true ] ; then
+	echo "Setting up SSL"
+	set_ssl "True"
+
+	echo "Setting SSL cert location"
+	set_ssl_cert $OB_SSL_CERT
+
+	echo "Setting SSL key location"
+	set_ssl_key $OB_SSL_KEY
+fi
+
+echo "Executing ${@}"
+exec "$@"

market/protocol.py

@@ -161,10 +161,10 @@ def rpc_follow(self, sender, proto, signature):
 
             # Send SMTP notification
             notification = SMTPNotification(self.db)
-            notification.send("[OpenBazaar] %s is now following you!" % m.name,
+            notification.send("[OpenBazaar] %s is now following you!" % f.metadata.name,
                               "You have a new follower:<br><br>Name: %s<br>GUID: <a href=\"ob://%s\">%s</a><br>"
                               "Handle: %s" %
-                              (m.name, f.guid.encode('hex'), f.guid.encode('hex'), m.handle))
+                              (f.metadata.name, f.guid.encode('hex'), f.guid.encode('hex'), f.metadata.handle))
 
             return ["True", m.SerializeToString(), self.signing_key.sign(m.SerializeToString())[:64]]
         except Exception: