Merge remote-tracking branch 'upstream/master'

Tom Galloway · Tom Galloway · commit 95dbb438fe94 · 2016-02-14T19:51:27.000Z
diff --git a/api/restapi.py b/api/restapi.py
@@ -596,14 +596,23 @@ def delete_contract(self, request):
             return server.NOT_DONE_YET
 
     @GET('^/api/v1/shutdown')
-    @authenticated
     def shutdown(self, request):
-        vendor_store = self.db.VendorStore()
-        for vendor in self.protocol.vendors.values():
-            vendor_store.save_vendor(vendor.id.encode("hex"), vendor.getProto().SerializeToString())
-        PortMapper().clean_my_mappings(self.kserver.node.port)
-        self.protocol.shutdown()
-        reactor.stop()
+        session = request.getSession()
+        if session not in self.authenticated_sessions and request.getHost().host != "127.0.0.1":
+            session.expire()
+            request.setResponseCode(401)
+            request.write('<html><body><div><span style="color:red">Authorization Error</span></div>'
+                          '<h2>Permission Denied</h2></body></html>')
+            request.finish()
+            return server.NOT_DONE_YET
+        else:
+            vendor_store = self.db.VendorStore()
+            for vendor in self.protocol.vendors.values():
+                vendor_store.save_vendor(vendor.id.encode("hex"), vendor.getProto().SerializeToString())
+            PortMapper().clean_my_mappings(self.kserver.node.port)
+            self.protocol.shutdown()
+            reactor.stop()
+            return
 
     @POST('^/api/v1/make_moderator')
     @authenticated
diff --git a/market/contracts.py b/market/contracts.py
@@ -822,7 +822,7 @@ def on_tx_received(self, address_version, address_hash, height, block_hash, tx):
                     for outpoint in outpoints:
                         self.amount_funded += outpoint["value"]
                         self.received_txs.append(tx)
-                        self.outpoints.extend(outpoint)
+                        self.outpoints.append(outpoint)
                 if self.amount_funded >= amount_to_pay:  # if fully funded
                     self.blockchain.unsubscribe_address(
                         self.contract["buyer_order"]["order"]["payment"]["address"], self.on_tx_received)
diff --git a/openbazaard.py b/openbazaard.py
@@ -3,11 +3,11 @@
 import argparse
 import json
 import platform
-import requests
 import socket
 import stun
 import sys
 import time
+import urllib2
 from api.ws import WSFactory, AuthenticatedWebSocketProtocol, AuthenticatedWebSocketFactory
 from api.restapi import RestAPI
 from config import DATA_FOLDER, KSIZE, ALPHA, LIBBITCOIN_SERVER,\
@@ -263,10 +263,13 @@ def stop(self):
                 description="Shutdown the server and disconnect",
                 usage='''usage:
         python openbazaard.py stop''')
-            parser.parse_args(sys.argv[2:])
+            parser.add_argument('-r', '--restapiport', help="set the rest api port to shutdown cleanly",
+                                default=18469)
+            args = parser.parse_args(sys.argv[2:])
             print "OpenBazaar server stopping..."
             try:
-                requests.get("http://localhost:18469/api/v1/shutdown")
+                request = urllib2.build_opener()
+                request.open('http://localhost:' + args.restapiport + '/api/v1/shutdown')
             except Exception:
                 self.daemon.stop()
 
diff --git a/requirements.txt b/requirements.txt
@@ -9,7 +9,6 @@ txrestapi==0.2
 txws==0.9.1
 python-libbitcoinclient==0.3.2
 python-bitcoinlib==0.5.0
-requests==2.7.0
 pyopenssl==0.15.1
 miniupnpc==1.9
 bleach==1.4.2
