CMakeLists.txt

@@ -6,7 +6,7 @@ include(CTest)
 include(GNUInstallDirs)
 
 set(PROJECT_VERSION_MAJOR 2)
-set(PROJECT_VERSION_MINOR 2)
+set(PROJECT_VERSION_MINOR 3)
 set(PROJECT_VERSION_PATCH 0)
 set(RUBLON_VERSION_STRING "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")
 
@@ -34,10 +34,10 @@ execute_process (
 if ( ${outOS} MATCHES "ubuntu" OR ${outOS} MATCHES "debian" OR ${outOS} MATCHES "FREEBSD" )
 install(
     FILES
-	${CMAKE_CURRENT_LIST_DIR}/rsc/rublon.config.defaults
+        ${CMAKE_CURRENT_LIST_DIR}/rsc/rublon.config.defaults
         ${CMAKE_CURRENT_LIST_DIR}/service/01-rublon-ssh_pubkey.conf.default
-	${CMAKE_CURRENT_LIST_DIR}/service/01-rublon-ssh.conf.default
+        ${CMAKE_CURRENT_LIST_DIR}/service/01-rublon-ssh.conf.default
-	${CMAKE_CURRENT_LIST_DIR}/service/inst_pubkey.sh
+        ${CMAKE_CURRENT_LIST_DIR}/service/inst_pubkey.sh
     DESTINATION
         share/rublon
     COMPONENT
@@ -50,17 +50,17 @@ install(
 else ()
     install(
         FILES
-           ${CMAKE_CURRENT_LIST_DIR}/rsc/rublon.config.defaults
+            ${CMAKE_CURRENT_LIST_DIR}/rsc/rublon.config.defaults
-           ${CMAKE_CURRENT_LIST_DIR}/service/01-rublon-ssh_pubkey.conf.default
+            ${CMAKE_CURRENT_LIST_DIR}/service/01-rublon-ssh_pubkey.conf.default
-	   ${CMAKE_CURRENT_LIST_DIR}/service/01-rublon-ssh.conf.default
+            ${CMAKE_CURRENT_LIST_DIR}/service/01-rublon-ssh.conf.default
-           ${CMAKE_CURRENT_LIST_DIR}/service/login_rublon.mod
+            ${CMAKE_CURRENT_LIST_DIR}/service/login_rublon.mod
-           ${CMAKE_CURRENT_LIST_DIR}/service/login_rublon.pp
+            ${CMAKE_CURRENT_LIST_DIR}/service/login_rublon.pp
-           ${CMAKE_CURRENT_LIST_DIR}/service/login_rublon.te
+            ${CMAKE_CURRENT_LIST_DIR}/service/login_rublon.te
-           ${CMAKE_CURRENT_LIST_DIR}/service/pam_service.txt
+            ${CMAKE_CURRENT_LIST_DIR}/service/pam_service.txt
-           ${CMAKE_CURRENT_LIST_DIR}/service/rublon_veritas
+            ${CMAKE_CURRENT_LIST_DIR}/service/rublon_veritas
-	   ${CMAKE_CURRENT_LIST_DIR}/service/inst_pubkey_rhel_9.sh
+            ${CMAKE_CURRENT_LIST_DIR}/service/inst_pubkey_rhel_9.sh
-	   ${CMAKE_CURRENT_LIST_DIR}/service/inst_pubkey_rhel_8.sh
+            ${CMAKE_CURRENT_LIST_DIR}/service/inst_pubkey_rhel_8.sh
-	   ${CMAKE_CURRENT_LIST_DIR}/service/inst_pubkey.sh
+            ${CMAKE_CURRENT_LIST_DIR}/service/inst_pubkey.sh
         DESTINATION
             share/rublon
         COMPONENT

PAM/ssh/CMakeLists.txt

@@ -5,11 +5,12 @@ set(INC
     ${CMAKE_CURRENT_SOURCE_DIR}/include/rublon/bits.hpp
     ${CMAKE_CURRENT_SOURCE_DIR}/include/rublon/check_application.hpp
     ${CMAKE_CURRENT_SOURCE_DIR}/include/rublon/configuration.hpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/include/rublon/configuration.hpp.orig
     ${CMAKE_CURRENT_SOURCE_DIR}/include/rublon/core_handler.hpp
     ${CMAKE_CURRENT_SOURCE_DIR}/include/rublon/core_handler_interface.hpp
     ${CMAKE_CURRENT_SOURCE_DIR}/include/rublon/curl.hpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/include/rublon/error.hpp
     ${CMAKE_CURRENT_SOURCE_DIR}/include/rublon/error_handler.hpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/include/rublon/error.hpp
     ${CMAKE_CURRENT_SOURCE_DIR}/include/rublon/finish.hpp
     ${CMAKE_CURRENT_SOURCE_DIR}/include/rublon/init.hpp
     ${CMAKE_CURRENT_SOURCE_DIR}/include/rublon/json.hpp
@@ -18,8 +19,8 @@ set(INC
     ${CMAKE_CURRENT_SOURCE_DIR}/include/rublon/method/method_select.hpp
     ${CMAKE_CURRENT_SOURCE_DIR}/include/rublon/method/OTP.hpp
     ${CMAKE_CURRENT_SOURCE_DIR}/include/rublon/method/passcode_based_auth.hpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/include/rublon/method/PUSH.hpp
     ${CMAKE_CURRENT_SOURCE_DIR}/include/rublon/method/phone_call.hpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/include/rublon/method/PUSH.hpp
     ${CMAKE_CURRENT_SOURCE_DIR}/include/rublon/method/SMS.hpp
     ${CMAKE_CURRENT_SOURCE_DIR}/include/rublon/method/SmsLink.hpp
     ${CMAKE_CURRENT_SOURCE_DIR}/include/rublon/method/websocket_based_auth.hpp
@@ -27,6 +28,7 @@ set(INC
     ${CMAKE_CURRENT_SOURCE_DIR}/include/rublon/non_owning_ptr.hpp
     ${CMAKE_CURRENT_SOURCE_DIR}/include/rublon/pam_action.hpp
     ${CMAKE_CURRENT_SOURCE_DIR}/include/rublon/pam.hpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/include/rublon/pam_stub.hpp
     ${CMAKE_CURRENT_SOURCE_DIR}/include/rublon/rublon.hpp
     ${CMAKE_CURRENT_SOURCE_DIR}/include/rublon/session.hpp
     ${CMAKE_CURRENT_SOURCE_DIR}/include/rublon/sign.hpp
@@ -128,7 +130,7 @@ FetchContent_Declare(
   RapidJSON
   URL           https://github.com/Tencent/rapidjson/archive/refs/tags/v1.1.0.zip
   URL_HASH      MD5=ceb1cf16e693a3170c173dc040a9d2bd
-  # PATCH_COMMAND patch -p1 < ${CMAKE_CURRENT_LIST_DIR}/patches/rapidjson.patch
+  PATCH_COMMAND patch -p1 < ${CMAKE_CURRENT_LIST_DIR}/patches/rapidjson.patch
 )
 
 if(NOT RapidJSON_POPULATED)
@@ -139,6 +141,6 @@ endif()
 add_subdirectory(lib)
 add_subdirectory(bin)
 
-# if(${ENABLE_TESTS})
+# if(${ENABLE_TESTS}):
 #   add_subdirectory(tests)
 # endif()

PAM/ssh/patches/rapidjson.patch

@@ -1,3 +1,16 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index ceda71b..0128f99 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -9,6 +9,7 @@ endif()
+ 
+ SET(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules)
+ 
++cmake_policy(SET CMP0048 NEW)
+ PROJECT(RapidJSON CXX)
+ 
+ set(LIB_MAJOR_VERSION "1")
+
 diff --git a/include/rapidjson/document.h b/include/rapidjson/document.h
 index e3e20dfb..592c5678 100644
 --- a/include/rapidjson/document.h