Merge pull request #204 from indigo-dc/dev_3.0.2

Dev 3.0.2

VERSION

@@ -1 +1 @@
-3.0.1
+3.0.2

debian/changelog

@@ -1,4 +1,4 @@
-oidc-agent (3.0.1) UNRELEASED; urgency=medium
+oidc-agent (3.0.2) UNRELEASED; urgency=medium
 
   [ Marcus hardt ]
   * Trying to fix debuild messages
@@ -254,6 +254,12 @@ oidc-agent (3.0.1) UNRELEASED; urgency=medium
   * oidc-token can now also be used with issuer urls
 
   [ Gabriel Zachmann]
-  * Added the elixir public client to the lsit of public clients
+  * Added the elixir public client to the list of public clients
 
- -- Marcus Hardt <[email protected]>  Mon, 01 Apr 2019 08:12:09 +0100
+  [ Gabriel Zachmann ]
+  * Fixed a segfault if the pubclients.conf file does not exist
+  * Fixed segfault if the issuer.config in the oidc-agent directory doesn't
+    exist and an AT is requested by issuer.
+  * Fixed behavior of oidc-gen -p when the passed file does not exist. 
+
+ -- Marcus Hardt <[email protected]>  Tue, 23 Apr 2019 16:06:13 +0100

src/account/account.c

@@ -51,9 +51,12 @@ struct oidc_account* updateAccountWithPublicClientInfo(
     oidc_setArgNullFuncError(__func__);
     return NULL;
   }
-  char*        issuer_url     = account_getIssuerUrl(account);
-  list_t*      pubClientLines = getLinesFromFile(ETC_PUBCLIENTS_CONFIG_FILE);
-  list_node_t* node;
+  char*   issuer_url     = account_getIssuerUrl(account);
+  list_t* pubClientLines = getLinesFromFile(ETC_PUBCLIENTS_CONFIG_FILE);
+  if (pubClientLines == NULL) {
+    return NULL;
+  }
+  list_node_t*     node;
   list_iterator_t* it = list_iterator_new(pubClientLines, LIST_HEAD);
   while ((node = list_iterator_next(it))) {
     char* client = strtok(node->val, "@");

src/oidc-agent/oidcp/proxy_handler.c

@@ -75,7 +75,10 @@ char* getDefaultAccountConfigForIssuer(const char* issuer_url) {
     oidc_setArgNullFuncError(__func__);
     return NULL;
   }
-  list_t*          issuers   = getLinesFromOidcFile(ISSUER_CONFIG_FILENAME);
+  list_t* issuers = getLinesFromOidcFile(ISSUER_CONFIG_FILENAME);
+  if (issuers == NULL) {
+    return NULL;
+  }
   char*            shortname = NULL;
   list_node_t*     node;
   list_iterator_t* it = list_iterator_new(issuers, LIST_HEAD);

src/oidc-gen/gen_handler.c

@@ -853,7 +853,9 @@ oidc_error_t gen_handlePublicClient(struct oidc_account* account,
   arguments->usePublicClient       = 1;
   oidc_gen_state.doNotMergeTmpFile = 1;
   char* old_client_id              = account_getClientId(account);
-  updateAccountWithPublicClientInfo(account);
+  if (updateAccountWithPublicClientInfo(account) == NULL) {
+    return oidc_errno;
+  }
   if (account_getClientId(account) == old_client_id) {
     return OIDC_ENOPUBCLIENT;
   }

src/utils/file_io/cryptFileUtils.c

@@ -66,6 +66,9 @@ char* decryptFile(const char* filepath, const char* password) {
     oidc_setArgNullFuncError(__func__);
     return NULL;
   }
+  if (!fileDoesExist(filepath)) {
+    return NULL;
+  }
   list_t* lines = getLinesFromFile(filepath);
   if (lines == NULL) {
     return NULL;

src/utils/file_io/promptCryptFileUtils.c

@@ -1,5 +1,7 @@
 #include "promptCryptFileUtils.h"
 #include "utils/file_io/cryptFileUtils.h"
+#include "utils/file_io/file_io.h"
+#include "utils/file_io/oidc_file_io.h"
 #include "utils/promptUtils.h"
 
 oidc_error_t _promptAndCryptAndWriteToAnyFile(
@@ -57,6 +59,10 @@ struct resultWithEncryptionPassword getDecryptedFileAndPasswordFor(
     oidc_setArgNullFuncError(__func__);
     return RESULT_WITH_PASSWORD_NULL;
   }
+  if (!fileDoesExist(filepath)) {
+    oidc_errno = OIDC_EFNEX;
+    return RESULT_WITH_PASSWORD_NULL;
+  }
   return _getDecryptedTextAndPasswordWithPromptFor(filepath, filepath,
                                                    decryptFile, 0, pw_cmd);
 }
@@ -67,6 +73,10 @@ struct resultWithEncryptionPassword getDecryptedOidcFileAndPasswordFor(
     oidc_setArgNullFuncError(__func__);
     return RESULT_WITH_PASSWORD_NULL;
   }
+  if (!oidcFileDoesExist(filename)) {
+    oidc_errno = OIDC_EFNEX;
+    return RESULT_WITH_PASSWORD_NULL;
+  }
   return _getDecryptedTextAndPasswordWithPromptFor(filename, filename,
                                                    decryptOidcFile, 1, pw_cmd);
 }

src/utils/oidc_error.h

@@ -20,6 +20,7 @@ enum _oidc_error {
   OIDC_EFOPEN = -6,
   OIDC_EFREAD = -7,
   OIDC_EWRITE = -8,
+  OIDC_EFNEX  = -9,
 
   OIDC_EURL   = -10,
   OIDC_ESSL   = -11,
@@ -147,6 +148,7 @@ static inline char* oidc_serrorFor(oidc_error_t err) {
     case OIDC_EFOPEN: return "could not open file";
     case OIDC_EFREAD: return "could not read file";
     case OIDC_EWRITE: return "could not write";
+    case OIDC_EFNEX: return "could not open file - file does not exist";
     case OIDC_EPASS: return "wrong password";
     case OIDC_ECRYPPUB: return "received suspicious public key";
     case OIDC_ECRYPM: return "encryption malformed";

src/utils/stringUtils.c

@@ -115,8 +115,14 @@ char* getDateString() {
     return NULL;
   }
   time_t     now = time(NULL);
-  struct tm* t   = localtime(&now);
+  struct tm* t   = secAlloc(sizeof(struct tm));
+  if (localtime_r(&now, t) == NULL) {
+    oidc_setErrnoError();
+    secFree(t);
+    return NULL;
+  }
   strftime(s, 10 + 1, "%F", t);
+  secFree(t);
   return s;
 }