A few updates; switch to 0.6.0

Author: kimlaine

CHANGES.md

@@ -1,5 +1,11 @@
 # List of Changes
 
+## Version 0.6.0
+
+- Added a function `SenderDB::clear_oprf_key` to clear the OPRF key from a `SenderDB`. This can be useful in some situations, where the `SenderDB` should serve query requests in an untrusted environment and should have no access to the OPRF key. Note that the `SenderDB::strip` function does **not** clear the OPRF key.
+- Removed `parameters/16M-256.json`: use [parameters/16M-1024.json](parameters/16M-1024.json) instead.
+- Added some error handling code in [sender/apsi/zmq/sender_dispatcher.cpp](sender/apsi/zmq/sender_dispatcher.cpp).
+
 ## Version 0.5.0
 
 - Added flexibility to use *any* value for `felts_per_item` in `PSIParams`, not just a power of two.

CMakeLists.txt

@@ -26,7 +26,7 @@ if(NOT CMAKE_BUILD_TYPE)
 endif()
 message(STATUS "Build type (CMAKE_BUILD_TYPE): ${CMAKE_BUILD_TYPE}")
 
-project(APSI VERSION 0.5.0 LANGUAGES CXX C)
+project(APSI VERSION 0.6.0 LANGUAGES CXX C)
 
 # This policy was introduced in CMake 3.13; OLD by default until CMake 3.21
 cmake_policy(SET CMP0077 NEW)

parameters/16M-256.json

@@ -131,6 +131,15 @@ namespace apsi {
             */
             void strip();
 
+            /**
+            Clears the OPRF key. The SenderDB cannot be used to serve OPRF requests after calling
+            this function.
+            */
+            void clear_oprf_key() const
+            {
+                oprf_key_.clear();
+            }
+
             /**
             Returns a copy of the OPRF key.
             */

sender/apsi/sender_db.h

@@ -144,36 +144,36 @@ namespace apsi {
         {
             STOPWATCH(sender_stopwatch, "ZMQSenderDispatcher::dispatch_query");
 
-            // try {
-            // Create the Query object
-            Query query(to_query_request(move(sop->sop)), sender_db_);
-
-            // Query will send result to client in a stream of ResultPackages (ResultParts)
-            Sender::RunQuery(
-                query,
-                chl,
-                // Lambda function for sending the query response
-                [&sop](Channel &c, Response response) {
-                    auto nsop_response = make_unique<ZMQSenderOperationResponse>();
-                    nsop_response->sop_response = move(response);
-                    nsop_response->client_id = sop->client_id;
-
-                    // We know for sure that the channel is a SenderChannel so use static_cast
-                    static_cast<ZMQSenderChannel &>(c).send(move(nsop_response));
-                },
-                // Lambda function for sending the result parts
-                [&sop](Channel &c, ResultPart rp) {
-                    auto nrp = make_unique<ZMQResultPackage>();
-                    nrp->rp = move(rp);
-                    nrp->client_id = sop->client_id;
-
-                    // We know for sure that the channel is a SenderChannel so use static_cast
-                    static_cast<ZMQSenderChannel &>(c).send(move(nrp));
-                });
-            // } catch (const exception &ex) {
-            //     APSI_LOG_ERROR("Sender threw an exception while processing query: " <<
-            //     ex.what());
-            // }
+            try {
+                // Create the Query object
+                Query query(to_query_request(move(sop->sop)), sender_db_);
+
+                // Query will send result to client in a stream of ResultPackages (ResultParts)
+                Sender::RunQuery(
+                    query,
+                    chl,
+                    // Lambda function for sending the query response
+                    [&sop](Channel &c, Response response) {
+                        auto nsop_response = make_unique<ZMQSenderOperationResponse>();
+                        nsop_response->sop_response = move(response);
+                        nsop_response->client_id = sop->client_id;
+
+                        // We know for sure that the channel is a SenderChannel so use static_cast
+                        static_cast<ZMQSenderChannel &>(c).send(move(nsop_response));
+                    },
+                    // Lambda function for sending the result parts
+                    [&sop](Channel &c, ResultPart rp) {
+                        auto nrp = make_unique<ZMQResultPackage>();
+                        nrp->rp = move(rp);
+                        nrp->client_id = sop->client_id;
+
+                        // We know for sure that the channel is a SenderChannel so use static_cast
+                        static_cast<ZMQSenderChannel &>(c).send(move(nrp));
+                    });
+            } catch (const exception &ex) {
+                apsi_log_error("sender threw an exception while processing query: " <<
+                ex.what());
+            }
         }
     } // namespace sender
 } // namespace apsi