Merge remote-tracking branch 'upstream/master'

Author: timtheisen

src/scitokens.cpp

@@ -56,7 +56,7 @@ int scitoken_set_claim_string(SciToken token, const char *key, const char *value
         return -1;
     }
     try {
-        real_token->set_claim(key, std::string(value));
+        real_token->set_claim(key, jwt::claim(std::string(value)));
     } catch (std::exception &exc) {
         if (err_msg) {
             *err_msg = strdup(exc.what());

src/scitokens_cache.cpp

@@ -1,7 +1,7 @@
 
 #include <cstdint>
 #include <string>
-#include <vector>
+#include <memory>
 
 #include <pwd.h>
 #include <stdlib.h>
@@ -11,7 +11,7 @@
 #ifndef PICOJSON_USE_INT64
 #define PICOJSON_USE_INT64
 #endif
-#include <jwt-cpp/picojson.h>
+#include <picojson/picojson.h>
 #include <sqlite3.h>
 
 #include "scitokens_internal.h"
@@ -54,12 +54,11 @@ get_cache_file() {
     auto bufsize = sysconf(_SC_GETPW_R_SIZE_MAX);
     bufsize = (bufsize == -1) ? 16384 : bufsize;
 
-    std::vector<char> buf;
-    buf.reserve(bufsize);
+    std::unique_ptr<char[]> buf(new char[bufsize]);
 
     std::string home_dir;
     struct passwd pwd, *result = NULL;
-    getpwuid_r(geteuid(), &pwd, &buf[0], bufsize, &result);
+    getpwuid_r(geteuid(), &pwd, buf.get(), bufsize, &result);
     if (result && result->pw_dir) {
         home_dir = result->pw_dir;
         home_dir += "/.cache";

src/scitokens_internal.cpp

@@ -1,11 +1,12 @@
 
 #include <memory>
 #include <sstream>
+#include <functional>
 
 #include <curl/curl.h>
 #include <jwt-cpp/base.h>
 #include <jwt-cpp/jwt.h>
-#include <jwt-cpp/picojson.h>
+#include <picojson/picojson.h>
 #include <openssl/bn.h>
 #include <openssl/ec.h>
 
@@ -100,7 +101,7 @@ parse_url(const std::string &url, std::string &schema, std::string &netloc,
     schema.reserve(distance(url.begin(), prot_iter));
     std::transform(url.begin(), prot_iter,
                   std::back_inserter(schema),
-                  std::ptr_fun<int,int>(tolower));
+                  std::function<int(int)>(tolower));
     if (prot_iter == url.end() )
     {
         throw InvalidIssuerException("Issuer URL missing hostname.");
@@ -110,7 +111,7 @@ parse_url(const std::string &url, std::string &schema, std::string &netloc,
     netloc.reserve(std::distance(prot_iter, path_iter));
     std::transform(prot_iter, path_iter,
                    std::back_inserter(netloc),
-                   std::ptr_fun<int,int>(tolower));
+                   std::function<int(int)>(tolower));
     std::string::const_iterator query_iter = std::find(path_iter, url.end(), '?');
     path.assign(path_iter, query_iter);
 }

src/scitokens_internal.h

@@ -203,19 +203,19 @@ friend class scitokens::Validator;
         uuid_generate(uuid);
         char uuid_str[37];
         uuid_unparse_lower(uuid, uuid_str);
-        m_claims["jti"] = std::string(uuid_str);
+        m_claims["jti"] = jwt::claim(std::string(uuid_str));
 
         if (m_serialize_profile == Profile::SCITOKENS_2_0) {
-            m_claims["ver"] = std::string("scitokens:2.0");
+            m_claims["ver"] = jwt::claim(std::string("scitoken:2.0"));
             auto iter = m_claims.find("aud");
             if (iter == m_claims.end()) {
-                m_claims["aud"] = std::string("ANY");
+                m_claims["aud"] = jwt::claim(std::string("ANY"));
             }
         } else if (m_serialize_profile == Profile::WLCG_1_0) {
-            m_claims["wlcg.ver"] = std::string("1.0");
+            m_claims["wlcg.ver"] = jwt::claim(std::string("1.0"));
             auto iter = m_claims.find("aud");
             if (iter == m_claims.end()) {
-                m_claims["aud"] = std::string("https://wlcg.cern.ch/jwt/v1/any");
+                m_claims["aud"] = jwt::claim(std::string("https://wlcg.cern.ch/jwt/v1/any"));
             }
         }
 
@@ -312,7 +312,7 @@ class Validator {
                 throw jwt::token_verification_exception("'ver' claim value must be a string (if present)");
             }
             std::string ver_string = claim.as_string();
-            if (ver_string == "scitokens:2.0") {
+            if ((ver_string == "scitokens:2.0") || (ver_string == "scitoken:2.0")) {
                 must_verify_everything = false;
                 if ((m_validate_profile != SciToken::Profile::COMPAT) &&
                     (m_validate_profile != SciToken::Profile::SCITOKENS_2_0))