Merge pull request #1522 from atsign-foundation/atc-0-3-1

fix: undo sys/wait removal

packages/c/cmake/atsdk.cmake

@@ -3,7 +3,7 @@ if(NOT atsdk_FOUND)
   FetchContent_Declare(
     atsdk
     GIT_REPOSITORY https://github.com/atsign-foundation/at_c.git
-    GIT_TAG 42daadfd9f4b6b83e6d4b3ad328a691a91bcfe4c
+    GIT_TAG 6650e33ab80e9d873ede6d0213fa2999054fce7b
   )
   FetchContent_MakeAvailable(atsdk)
   install(TARGETS atclient atchops atlogger)

packages/c/srv/src/params.c

@@ -13,6 +13,8 @@ void apply_default_values_to_srv_params(srv_params_t *params) {
 }
 
 int parse_srv_params(srv_params_t *params, int argc, const char **argv, srv_env_t *environment) {
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wmissing-field-initializers"
   struct argparse_option options[] = {
       OPT_BOOLEAN(0, "help", NULL, "show this help message and exit", argparse_help_cb, 0, OPT_NONEG),
       OPT_STRING('h', "host", &params->host, "rvd host"),
@@ -33,6 +35,7 @@ int parse_srv_params(srv_params_t *params, int argc, const char **argv, srv_env_
                   "How long to keep the socket connector open if there have been no connections"),
       OPT_END(),
   };
+#pragma clang diagnostic pop
 
   struct argparse argparse;
   argparse_init(&argparse, options, NULL, 0);

packages/c/srv/src/side.c

@@ -8,7 +8,6 @@
 #include <srv/params.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sys/socket.h>
 #include <unistd.h>
 
 #define TAG "srv - side"
@@ -118,7 +117,8 @@ void *srv_side_handle(void *side) {
       }
       memset(buffer, 0, BUFFER_LEN * sizeof(unsigned char));
     }
-    if (output) free(output);
+    if (output)
+      free(output);
     free(buffer);
     mbedtls_net_close(&s->socket);
   } else {

packages/c/srv/src/srv.c

@@ -93,7 +93,7 @@ int run_srv_daemon_side_multi(srv_params_t *params) {
   // This socket will decrypt the messages comming from the other side
   // which provide the information to create new sockets
   side_t control_side;
-  side_hints_t hints_control = {1, 0, params->host, params->port};
+  side_hints_t hints_control = {1, 0, params->host, params->port, NULL};
   if (params->rv_e2ee) {
     hints_control.transformer = &decrypter;
   }
@@ -166,7 +166,7 @@ int run_srv_daemon_side_multi(srv_params_t *params) {
       goto exit;
     }
 
-    for (int i = 0; i < nrequests; i++) {
+    for (size_t i = 0; i < nrequests; i++) {
       // Now process each of those requests
       res = parse_control_message(requests[i], &messagetype, &new_session_aes_key_string, &new_session_aes_iv_string);
       if (res != 0) {
@@ -246,14 +246,13 @@ int run_srv_daemon_side_multi(srv_params_t *params) {
 int socket_to_socket(const srv_params_t *params, const char *auth_string, chunked_transformer_t *encrypter,
                      chunked_transformer_t *decrypter, bool is_srv_ready) {
   side_t sides[2];
-  side_hints_t hints_a = {1, 0, params->local_host, params->local_port};
-  side_hints_t hints_b = {0, 0, params->host, params->port};
+  side_hints_t hints_a = {1, 0, params->local_host, params->local_port, NULL};
+  side_hints_t hints_b = {0, 0, params->host, params->port, NULL};
 
   if (params->rv_e2ee) {
     hints_a.transformer = encrypter;
     hints_b.transformer = decrypter;
   }
-
   atlogger_log(TAG, INFO, "Initializing connection for side a\n");
   int res = srv_side_init(&hints_a, &sides[0]);
   if (res != 0) {
@@ -270,7 +269,8 @@ int socket_to_socket(const srv_params_t *params, const char *auth_string, chunke
 
   int fds[2], tidx;
   int exit_res = 0;
-  pthread_t threads[2], tid;
+  pthread_t threads[2];
+  pthread_t tid = NULL;
   pipe(fds);
 
   srv_link_sides(&sides[0], &sides[1], fds);
@@ -350,10 +350,13 @@ int socket_to_socket(const srv_params_t *params, const char *auth_string, chunke
   return 0;
 }
 
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunused-parameter"
 int server_to_socket(const srv_params_t *params, const char *auth_string, chunked_transformer_t *encrypter,
                      chunked_transformer_t *decrypter) {
   return 0;
 }
+#pragma clang diagnostic pop
 
 int create_encrypter_and_decrypter(const char *session_aes_key_string, const char *session_aes_iv_string,
                                    chunked_transformer_t *encrypter, chunked_transformer_t *decrypter) {
@@ -438,7 +441,6 @@ int aes_ctr_crypt_stream(const chunked_transformer_t *self, size_t len, const un
 
 static int process_multiple_requests(char *original, char **requests[], size_t *num_out_requests) {
   int ret = -1;
-  int num_requests = 0;
 
   char *temp = NULL;
   char *saveptr = original;

packages/c/sshnpd/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.2.4
+
+- fix: Disabled clang-tidy missing-includes, as it malformed header includes
+- fix: Restore the malformed headers
+
 ## 0.2.3
 
 - Update to atSDK v0.3.1 with type fixes

packages/c/sshnpd/include/sshnpd/handle_npt_request.h

@@ -5,6 +5,6 @@
 #include <pthread.h>
 
 void handle_npt_request(atclient *atclient, pthread_mutex_t *atclient_lock, sshnpd_params *params,
-                        bool *is_child_process, atclient_monitor_response *message, char *home_dir, FILE *authkeys_file,
-                        char *authkeys_filename, atchops_rsa_key_private_key signing_key);
+                        bool *is_child_process, atclient_monitor_response *message,
+                        atchops_rsa_key_private_key signing_key);
 #endif

packages/c/sshnpd/include/sshnpd/handle_ssh_request.h

@@ -5,7 +5,7 @@
 #include <pthread.h>
 
 void handle_ssh_request(atclient *atclient, pthread_mutex_t *atclient_lock, sshnpd_params *params,
-                        bool *is_child_process, atclient_monitor_response *message, char *home_dir, FILE *authkeys_file,
-                        char *authkeys_filename, atchops_rsa_key_private_key signing_key);
+                        bool *is_child_process, atclient_monitor_response *message,
+                        atchops_rsa_key_private_key signing_key);
 
 #endif

packages/c/sshnpd/include/sshnpd/version.h

@@ -1,4 +1,4 @@
 #ifndef SSHNPD_VERSION_H
 #define SSHNPD_VERSION_H
-#define SSHNPD_VERSION "0.2.3"
+#define SSHNPD_VERSION "0.2.4"
 #endif

packages/c/sshnpd/src/background_jobs.c

@@ -53,7 +53,7 @@ void *refresh_device_entry(void *void_refresh_device_entry_params) {
     pthread_exit(NULL);
   }
 
-  int index;
+  size_t index;
   for (index = 0; index < num_managers; index++) {
     // device_info
     size_t buffer_len = strlen(params->params->manager_list[index]) + infokey_base_len;
@@ -144,7 +144,7 @@ void *refresh_device_entry(void *void_refresh_device_entry_params) {
 
       fflush(stdout);
 
-      for (int i = 0; i < num_managers; i++) {
+      for (size_t i = 0; i < num_managers; i++) {
         if (params->params->hide) {
           ret = atclient_delete(params->atclient, infokeys + i, NULL, NULL);
         } else {

packages/c/sshnpd/src/handle_npt_request.c

@@ -17,13 +17,14 @@
 #include <sshnpd/run_srv_process.h>
 #include <stdlib.h>
 #include <string.h>
+#include <sys/wait.h>
 #include <unistd.h>
 
 #define LOGGER_TAG "NPT_REQUEST"
 
 void handle_npt_request(atclient *atclient, pthread_mutex_t *atclient_lock, sshnpd_params *params,
-                        bool *is_child_process, atclient_monitor_response *message, char *home_dir, FILE *authkeys_file,
-                        char *authkeys_filename, atchops_rsa_key_private_key signing_key) {
+                        bool *is_child_process, atclient_monitor_response *message,
+                        atchops_rsa_key_private_key signing_key) {
   int res = 0;
   if (!atclient_atnotification_is_from_initialized(&message->notification) && message->notification.from != NULL) {
     atlogger_log(LOGGER_TAG, ATLOGGER_LOGGING_LEVEL_ERROR, "Failed to initialize the from field of the notification\n");
@@ -510,7 +511,6 @@ void handle_npt_request(atclient *atclient, pthread_mutex_t *atclient_lock, sshn
 
   pid_t pid = fork();
   int status;
-  bool free_envelope = true;
 
   if (pid == 0) {
     // child process

packages/c/sshnpd/src/handle_ssh_request.c

@@ -16,13 +16,14 @@
 #include <sshnpd/run_srv_process.h>
 #include <stdlib.h>
 #include <string.h>
+#include <sys/wait.h>
 #include <unistd.h>
 
 #define LOGGER_TAG "SSH_REQUEST"
 
 void handle_ssh_request(atclient *atclient, pthread_mutex_t *atclient_lock, sshnpd_params *params,
-                        bool *is_child_process, atclient_monitor_response *message, char *home_dir, FILE *authkeys_file,
-                        char *authkeys_filename, atchops_rsa_key_private_key signing_key) {
+                        bool *is_child_process, atclient_monitor_response *message,
+                        atchops_rsa_key_private_key signing_key) {
   int res = 0;
   if (!atclient_atnotification_is_from_initialized(&message->notification) && message->notification.from != NULL) {
     atlogger_log(LOGGER_TAG, ATLOGGER_LOGGING_LEVEL_ERROR, "Failed to initialize the from field of the notification\n");
@@ -496,7 +497,6 @@ void handle_ssh_request(atclient *atclient, pthread_mutex_t *atclient_lock, sshn
 
   pid_t pid = fork();
   int status;
-  bool free_envelope = true;
 
   if (pid == 0) {
     // child process

packages/c/sshnpd/src/handle_sshpublickey.c

@@ -20,7 +20,7 @@ void handle_sshpublickey(sshnpd_params *params, atclient_monitor_response *messa
   }
 
   char *ssh_key = (char *)message->notification.decrypted_value;
-  size_t ssh_key_len = strlen(ssh_key);
+  // size_t ssh_key_len = strlen(ssh_key);
 
   bool is_valid_prefix = false;
   for (int i = 1; i < SUPPORTED_KEY_PREFIX_LEN; i++) {

packages/c/sshnpd/src/handler_commons.c

@@ -7,7 +7,7 @@
 #define LOGGER_TAG "VERIFY_REQUEST_SIGNATURE"
 
 int verify_envelope_signature(atchops_rsa_key_public_key publickey, const unsigned char *payload,
-                              unsigned char *signature, const char *hashing_algo, const char *signing_algo) {
+                              unsigned char *signature, const char *hashing_algo) {
   int ret = 0;
 
   atchops_md_type mdtype;
@@ -19,7 +19,7 @@ int verify_envelope_signature(atchops_rsa_key_public_key publickey, const unsign
     return -1;
   }
 
-  ret = atchops_rsa_verify(&publickey, ATCHOPS_MD_SHA256, payload, strlen((char *)payload), signature);
+  ret = atchops_rsa_verify(&publickey, mdtype, payload, strlen((char *)payload), signature);
   if (ret != 0) {
     atlogger_log(LOGGER_TAG, ATLOGGER_LOGGING_LEVEL_ERROR, "verify_envelope_signature (failed)\n");
     return -1;