Merge pull request #34 from CoLearn-Dev/0.1.16

PO install & upgrade; storage prefix without value; bugfix
- storage: maintain prefix in list_keys
- storage: privilege check
- pom: option for upgrade operator
- pom: support install_script
- mq: change account for amqp connection

Author: stneng

.gitmodules

@@ -1,4 +1,4 @@
 [submodule "proto"]
 	path = proto
-	url = git@github.com:CoLearn-Dev/colink-proto-dev.git
+	url = https://github.com/CoLearn-Dev/colink-proto-dev.git
 	branch = main

Cargo.lock

@@ -1,12 +1,13 @@
 [package]
 name = "colink-server"
-version = "0.1.15"
+version = "0.1.16"
 edition = "2021"
 
 [dependencies]
 async-trait = "0.1"
 chrono = "0.4"
 flate2 = "1.0"
+fs4 = { version = "0.6", features = ["sync"] }
 futures-lite = "1.12"
 hex = "0.4"
 jsonwebtoken = "7.2"

Cargo.toml

@@ -239,13 +239,7 @@ impl crate::mq::common::MQ for RabbitMQ {
 
 impl RabbitMQ {
     async fn connect(&self, user_uri: &str) -> Result<Channel, String> {
-        let user_uri = match url::Url::parse(user_uri) {
-            Ok(uri) => uri,
-            Err(e) => return Err(format!("MQ URI Parse Error: {}", e)),
-        };
-        let vhost_path = user_uri.path();
-        let uri = self.mq_amqp.clone() + vhost_path;
-        let mq = match Connection::connect(&uri, ConnectionProperties::default()).await {
+        let mq = match Connection::connect(user_uri, ConnectionProperties::default()).await {
             Ok(mq) => mq,
             Err(e) => return Err(format!("MQ Connection Error: {}", e)),
         };

proto

@@ -22,7 +22,6 @@ pub struct MyService {
     pub mq: Box<dyn MQ>,
     // We use this mutex to avoid the TOCTOU race condition in task storage.
     pub task_storage_mutex: Mutex<i32>,
-    pub pom_fetch_mutex: Mutex<i32>,
     pub public_key: secp256k1::PublicKey,
     pub secret_key: secp256k1::SecretKey,
     pub inter_core_ca_certificate: Option<Certificate>,
@@ -126,14 +125,14 @@ impl CoLink for GrpcService {
 
     async fn start_protocol_operator(
         &self,
-        request: Request<ProtocolOperatorInstance>,
-    ) -> Result<Response<ProtocolOperatorInstance>, Status> {
+        request: Request<StartProtocolOperatorRequest>,
+    ) -> Result<Response<ProtocolOperatorInstanceId>, Status> {
         self.service._start_protocol_operator(request).await
     }
 
     async fn stop_protocol_operator(
         &self,
-        request: Request<ProtocolOperatorInstance>,
+        request: Request<ProtocolOperatorInstanceId>,
     ) -> Result<Response<Empty>, Status> {
         self.service._stop_protocol_operator(request).await
     }
@@ -231,7 +230,6 @@ async fn run_server(
         jwt_secret,
         mq: Box::new(RabbitMQ::new(&mq_amqp, &mq_api, &mq_prefix)),
         task_storage_mutex: Mutex::new(0),
-        pom_fetch_mutex: Mutex::new(0),
         secret_key: core_secret_key,
         public_key: core_public_key,
         inter_core_ca_certificate: None,