From 50383f0c22a9102d0ca63b9c0a768b50754e6d50 Mon Sep 17 00:00:00 2001
From: kpo <kpo@astec.net>
Date: Thu, 24 Oct 2019 10:51:46 +0200
Subject: [PATCH] semodule install script

---
 Jenkinsfile                | 8 +++++---
 SSH/PAM/Makefile           | 1 +
 SSH/PAM/installsemodule.sh | 2 +-
 SSH/PAM/src/pamApp.c       | 6 +++---
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 2667520..0560447 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -32,15 +32,17 @@ pipeline {
                     --url https://rublon.com/ \
                     -n rublon-ssh -v 1.0 \
                     --iteration ${currentBuild.number}.el7 \
-		    --depends python \
-		    --depends python-pip \
+		    --depends epel-release \
+		    --depends python3 \
+		    --depends python3-pip \
 		    --depends openssh-server \
 		    --description \"Rublon SSH\" \
 		    --after-install /usr/src/SSH/PAM/installsemodule.sh \
                     /etc/rublon.config=/etc/rublon.config \
                     /usr/share/rublon-ssh/confirmMethod.py=/usr/share/rublon-ssh/confirmMethod.py \
                     /usr/share/rublon-ssh/confirmUser.py=/usr/share/rublon-ssh/confirmUser.py \
-                    /usr/lib64/security/pam_rublon.so=/usr/lib64/security/pam_rublon.so"
+                    /usr/lib64/security/pam_rublon.so=/usr/lib64/security/pam_rublon.so \
+		    /usr/share/rublon-ssh/login_rublon.pp=/usr/share/rublon-ssh/login_rublon.pp"
                 archiveArtifacts artifacts: '*.rpm', fingerprint: true
             }
         }
diff --git a/SSH/PAM/Makefile b/SSH/PAM/Makefile
index c662c64..6973ec5 100644
--- a/SSH/PAM/Makefile
+++ b/SSH/PAM/Makefile
@@ -12,6 +12,7 @@ install:
 	install -d $(DESTDIR)/usr/share/rublon-ssh
 	install -m 755 confirmMethod.py $(DESTDIR)/usr/share/rublon-ssh
 	install -m 755 confirmUser.py $(DESTDIR)/usr/share/rublon-ssh
+	install -m 644 login_rublon.pp $(DESTDIR)/usr/share/rublon-ssh
 
 	install -d $(DESTDIR)/usr/lib64/security
 	install -m 644 pam_rublon.so $(DESTDIR)/usr/lib64/security/
diff --git a/SSH/PAM/installsemodule.sh b/SSH/PAM/installsemodule.sh
index 4de568a..184f1aa 100755
--- a/SSH/PAM/installsemodule.sh
+++ b/SSH/PAM/installsemodule.sh
@@ -1,2 +1,2 @@
 #!/bin/bash
-semodule -i login_rublon.pp
+semodule -i /usr/share/rublon-ssh/login_rublon.pp
diff --git a/SSH/PAM/src/pamApp.c b/SSH/PAM/src/pamApp.c
index 20e253e..2e3a04c 100644
--- a/SSH/PAM/src/pamApp.c
+++ b/SSH/PAM/src/pamApp.c
@@ -11,7 +11,7 @@
 #include <curl/curl.h>
 #include <security/pam_appl.h>
 #include <security/pam_modules.h>
-#include <python2.7/Python.h>
+#include <python3.6m/Python.h>
 #include <pthread.h>
 
 struct args {
@@ -28,7 +28,7 @@ pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
 void* usersThread(void* input) {
    int out = -1;
     char *script;
-    asprintf(&script,"python /usr/share/rublon-ssh/confirmUser.py %s %s",((struct args*)input)->rublonApiServer ,((struct args*)input)->transactionId);
+    asprintf(&script,"python3 /usr/share/rublon-ssh/confirmUser.py %s %s",((struct args*)input)->rublonApiServer ,((struct args*)input)->transactionId);
     out = system(script);
     if(out != -1) {
         if(out == 256)
@@ -47,7 +47,7 @@ void* methodsThread(void* input) {
 
     int out = -1;
     char *script; 
-    asprintf(&script,"python /usr/share/rublon-ssh/confirmMethod.py %s %s",((struct args*)input)->rublonApiServer ,((struct args*)input)->transactionId);
+    asprintf(&script,"python3 /usr/share/rublon-ssh/confirmMethod.py %s %s",((struct args*)input)->rublonApiServer ,((struct args*)input)->transactionId);
     out = system(script);
     if(out != -1) {
         if(out == 256)