Added basic database functionality for storing master blocked list

Author: Audrey-Randall

proxy.go

@@ -158,6 +158,8 @@ func updateMasterList() error {
 	e.init(p, 1, hmacSecret, &s)
 	var rappor []int
 	for i := 0; i < len(blockedDomains); i++ {
+		fmt.Println("Blocked domains: ", blockedDomains)
+		fmt.Println(e.Encode([]byte(blockedDomains[i])))
 		rappor = append(rappor, e.Encode([]byte(blockedDomains[i])))
 	}
 	err := json.NewEncoder(&buf).Encode(rappor)
@@ -171,6 +173,7 @@ func updateMasterList() error {
 	if resp.StatusCode != 200 {
 		return errors.New("Master list update failed with response "+string(resp.StatusCode))
 	}
+	fmt.Println("Post request completed successfully.")
 	return nil
 }
 

server/server.py

@@ -5,23 +5,66 @@
 from flask_restful import Resource, Api, reqparse
 from json import dumps
 
-app = Flask(__name__)
-api = Api(app)
+import sqlite3
 
-parser = reqparse.RequestParser()
+class Sql():
+    def __init__(self, dbName):
+        self.conn = sqlite3.connect(dbName)
+        self.crsr = self.conn.cursor()
+        
+        cmd = """CREATE TABLE IF NOT EXISTS domains 
+        (domain VARCHAR(80) PRIMARY KEY);"""
+        self.crsr.execute(cmd)
+        self.conn.commit()
+            
+    def populateDummyData(self):
+        # SQL command to insert the data in the table
+        sql_command = """INSERT OR IGNORE INTO domains VALUES ("google.com");"""
+        self.crsr.execute(sql_command)
+        self.conn.commit()
+    
+    def getBlockedList(self):
+        cmd = "SELECT * FROM domains;"
+        self.crsr.execute(cmd)
+        return self.crsr.fetchall()
+        
 
 class BlockedList(Resource):
+    def __init__(self):
+        self.sql = Sql("master_blocked_list.db")
+        self.sql.populateDummyData()
+        
     def get(self):
         print("Request for blocked list made by client: ")
-        return [{'Domain':'Earth'}]
+        blocked = self.sql.getBlockedList()
+        print(blocked)
+        #return [{'Domain':'Earth'}]
+        return blocked
 
     def post(self):
         print("Client sent RAPPOR things to us: ")
-        args = parser.parse_args()
-        print(args)
+        data = request.data
+        print "Data: ", data[0]
         return '', 200
 
-api.add_resource(BlockedList, "/blocked")
-print("Starting Metis server...")
-app.run(debug=True)
-    
+def main():
+    app = Flask(__name__)
+    api = Api(app)
+    api.add_resource(BlockedList, "/blocked")
+    print("Starting Metis server...")
+    app.run(debug=True, threaded=True)
+    
+main()
+
+
+
+
+
+
+
+
+
+
+
+
+