Merge pull request #6 from djw8605/add-uuid

Adding UUID for jti generation

Author: bbockelm

CMakeLists.txt

@@ -6,6 +6,7 @@ set( CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake )
 
 find_package( jwt-cpp REQUIRED )
 find_package( CURL REQUIRED )
+find_package( UUID REQUIRED )
 
 if( CMAKE_COMPILER_IS_GNUCXX )
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Werror" )
@@ -33,10 +34,10 @@ endif()
 
 pkg_check_modules(SQLITE REQUIRED sqlite3)
 
-include_directories( "${PROJECT_SOURCE_DIR}" ${JWT_CPP_INCLUDES} ${CURL_INCLUDES} ${LIBCRYPTO_INCLUDE_DIRS} ${SQLITE_INCLUDE_DIRS})
+include_directories( "${PROJECT_SOURCE_DIR}" ${JWT_CPP_INCLUDES} ${CURL_INCLUDES} ${LIBCRYPTO_INCLUDE_DIRS} ${SQLITE_INCLUDE_DIRS}  ${UUID_INCLUDE_DIRS} )
 
 add_library(SciTokens SHARED src/scitokens.cpp src/scitokens_internal.cpp src/scitokens_cache.cpp)
-target_link_libraries(SciTokens ${LIBCRYPTO_LIBRARIES} ${CURL_LIBRARIES} ${SQLITE_LIBRARIES})
+target_link_libraries(SciTokens ${LIBCRYPTO_LIBRARIES} ${CURL_LIBRARIES} ${SQLITE_LIBRARIES} ${UUID_LIBRARIES})
 
 if ( UNIX )
 set_target_properties(SciTokens PROPERTIES LINK_FLAGS "-Wl,--version-script=${PROJECT_SOURCE_DIR}/configs/export-symbols")

cmake/FindUUID.cmake

@@ -0,0 +1,115 @@
+# - Try to find UUID
+# Once done this will define
+#
+#  UUID_FOUND - system has UUID
+#  UUID_INCLUDE_DIRS - the UUID include directory
+#  UUID_LIBRARIES - Link these to use UUID
+#  UUID_DEFINITIONS - Compiler switches required for using UUID
+#
+#  Copyright (c) 2006 Andreas Schneider <mail@cynapses.org>
+#
+#  Redistribution and use is allowed according to the terms of the New
+#  BSD license.
+#  For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+#
+
+include(CheckSymbolExists)
+
+# On mac, it can't find uuid library
+# So, just check for the functions with the default include
+CHECK_SYMBOL_EXISTS("uuid_generate" "uuid/uuid.h" UUID_SYMBOL)
+
+if (UUID_SYMBOL)
+  set(UUID_FOUND TRUE)
+elseif (UUID_LIBRARIES AND UUID_INCLUDE_DIRS)
+  # in cache already
+  set(UUID_FOUND TRUE)
+else (UUID_LIBRARIES AND UUID_INCLUDE_DIRS)
+  find_path(UUID_INCLUDE_DIR
+    NAMES
+      uuid/uuid.h
+    PATHS
+      ${UUID_DIR}/include
+      $ENV{UUID_DIR}/include
+      $ENV{UUID_DIR}
+      ${DELTA3D_EXT_DIR}/inc
+      $ENV{DELTA_ROOT}/ext/inc
+      $ENV{DELTA_ROOT}
+      ~/Library/Frameworks
+      /Library/Frameworks
+      /usr/local/include
+      /usr/include
+      /usr/include/gdal
+      /sw/include # Fink
+      /opt/local/include # DarwinPorts
+      /opt/csw/include # Blastwave
+      /opt/include
+      [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/include
+      /usr/freeware/include
+  )
+
+  find_library(UUID_LIBRARY
+    NAMES
+      uuid
+    PATHS
+      ${UUID_DIR}/lib
+      $ENV{UUID_DIR}/lib
+      $ENV{UUID_DIR}
+      ${DELTA3D_EXT_DIR}/lib
+      $ENV{DELTA_ROOT}/ext/lib
+      $ENV{DELTA_ROOT}
+      $ENV{OSG_ROOT}/lib
+      ~/Library/Frameworks
+      /Library/Frameworks
+      /usr/local/lib
+      /usr/lib
+      /sw/lib
+      /opt/local/lib
+      /opt/csw/lib
+      /opt/lib
+      /usr/freeware/lib64
+  )
+
+  find_library(UUID_LIBRARY_DEBUG
+    NAMES
+      uuidd
+    PATHS
+      ${UUID_DIR}/lib
+      $ENV{UUID_DIR}/lib
+      $ENV{UUID_DIR}
+      ${DELTA3D_EXT_DIR}/lib
+      $ENV{DELTA_ROOT}/ext/lib
+      $ENV{DELTA_ROOT}
+      $ENV{OSG_ROOT}/lib
+      ~/Library/Frameworks
+      /Library/Frameworks
+      /usr/local/lib
+      /usr/lib
+      /sw/lib
+      /opt/local/lib
+      /opt/csw/lib
+      /opt/lib
+      /usr/freeware/lib64
+  )
+
+  set(UUID_INCLUDE_DIRS ${UUID_INCLUDE_DIR})
+  set(UUID_LIBRARIES ${UUID_LIBRARY})
+
+  if (UUID_INCLUDE_DIRS AND UUID_LIBRARIES)
+     set(UUID_FOUND TRUE)
+  endif (UUID_INCLUDE_DIRS AND UUID_LIBRARIES)
+
+  if (UUID_FOUND)
+    if (NOT UUID_FIND_QUIETLY)
+      message(STATUS "Found UUID : ${UUID_LIBRARIES}")
+    endif (NOT UUID_FIND_QUIETLY)
+  else (UUID_FOUND)
+    if (UUID_FIND_REQUIRED)
+      message(FATAL_ERROR "Could not find UUID")
+    endif (UUID_FIND_REQUIRED)
+  endif (UUID_FOUND)
+
+  # show the UUID_INCLUDE_DIRS and UUID_LIBRARIES variables only in the advanced view
+  mark_as_advanced(UUID_INCLUDE_DIRS UUID_LIBRARIES)
+
+endif (UUID_SYMBOL)

src/scitokens_internal.h

@@ -3,6 +3,7 @@
 #include <sstream>
 
 #include <jwt-cpp/jwt.h>
+#include <uuid/uuid.h>
 
 namespace scitokens {
 
@@ -135,6 +136,12 @@ friend class scitokens::Validator;
         m_builder.set_not_before(time);
         m_builder.set_expires_at(time + std::chrono::seconds(m_lifetime));
 
+        uuid_t uuid;
+        uuid_generate(uuid);
+        char uuid_str[37];
+        uuid_unparse_lower(uuid, uuid_str);
+        m_builder.set_payload_claim("jti", std::string(uuid_str));
+
         // TODO: handle JTI
         return m_key.serialize(m_builder);
     }

src/test.cpp

@@ -37,6 +37,11 @@ int main(int argc, const char** argv) {
         return 1;
     }
     std::cout << "SciToken: " << value << std::endl;
+    auto decoded2 = jwt::decode(value);
+
+    for (auto& e : decoded2.get_payload_claims())
+        std::cout << e.first << " = " << e.second.to_json() << std::endl;
+
     scitoken_destroy(scitoken);
     scitoken_key_destroy(key);