bartoszek/rublon-ssh-old
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

RDEV-3625: Standarize defining 'os' parameter for init request

Browse Source
This commit is contained in:
rublon-jfr 2022-10-28 13:26:03 +02:00 committed by rublon-jfr
parent 844f239f0f
commit abd3201474
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SSH/PAM/Makefile
View File

@ -1,5 +1,5 @@
make:
gcc -fPIC -fno-stack-protector -std=c99 -I$(shell ./getPythonVersion.sh) -c rublonPam.c src/pamApp.c src/coreHandler.c src/signatureWrapper.c lib/cfg_parse.c lib/cJSON.c lib/qrcodegen.c
gcc -fPIC -fno-stack-protector -std=c99 -DOS_NAME="\"$(shell . /etc/os-release; echo $$PRETTY_NAME)\"" -I$(shell ./getPythonVersion.sh) -c rublonPam.c src/pamApp.c src/coreHandler.c src/signatureWrapper.c lib/cfg_parse.c lib/cJSON.c lib/qrcodegen.c
ld -x --shared -o pam_rublon.so -lcurl rublonPam.o pamApp.o coreHandler.o signatureWrapper.o cfg_parse.o cJSON.o qrcodegen.o
selinux:
checkmodule -M -m -o login_rublon.mod login_rublon.te

9
SSH/PAM/src/coreHandler.c
View File

@ -15,6 +15,11 @@
#include <security/pam_appl.h>
#include <security/pam_modules.h>
#ifndef OS_NAME
#error "OS_NAME not defined"
#endif
struct MemoryStruct {
char *memory;
size_t size;
@ -309,10 +314,10 @@ int postInit(pam_handle_t *pamh, cJSON **availableMethods, struct ApplicationInf
cJSON_AddStringToObject(params, "userIP", userIP);
cJSON_AddStringToObject(params, "appVer", moduleVersion);
cJSON_AddStringToObject(params, "os", "Centos7");
cJSON_AddStringToObject(params, "os", OS_NAME);
cJSON_AddItemToObject(initQuery, "params", params);
//debugLog("Init JSON object: ", cJSON_PrintUnformatted(initQuery));
debugLog("Init JSON object: ", cJSON_PrintUnformatted(initQuery));
asprintf(&url,"%s/api/transaction/init",rublonApiServer);
char *curlResponse = curlHandler(pamh, cJSON_PrintUnformatted(initQuery), url, secretKey);