From 0c909d5a930592872051643f1fdb1639169a2096 Mon Sep 17 00:00:00 2001 From: Jean-Luc Cyr Date: Tue, 13 Nov 2018 17:32:12 -0500 Subject: [PATCH] cleanup files --- absec_auto.h | 3 +++ absec_etc.h | 10 --------- absec_fs.c | 66 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ absec_mysql.c | 2 ++ absec_mysql.h | 3 --- absec_pam.h | 7 ------- readme.txt | 1 + test_auto.c | 42 +++++++++++++++++++++++++++++++++++++ test_etc.c | 16 --------------- test_mysql.c | 42 ------------------------------------- test_pam.c | 16 --------------- 11 files changed, 114 insertions(+), 94 deletions(-) create mode 100644 absec_auto.h delete mode 100644 absec_etc.h create mode 100644 absec_fs.c delete mode 100644 absec_mysql.h delete mode 100644 absec_pam.h create mode 100644 test_auto.c delete mode 100644 test_etc.c delete mode 100755 test_mysql.c delete mode 100644 test_pam.c diff --git a/absec_auto.h b/absec_auto.h new file mode 100644 index 0000000..7669c4a --- /dev/null +++ b/absec_auto.h @@ -0,0 +1,3 @@ + + +int mysql_lookup(request_rec *r, struct stat *fperm); diff --git a/absec_etc.h b/absec_etc.h deleted file mode 100644 index 0fe66a8..0000000 --- a/absec_etc.h +++ /dev/null @@ -1,10 +0,0 @@ - -#define PAM_OK 0 -#define PAM_ERROR_START -1 -#define PAM_ERROR_INVALID_CRED -2 -#define PAM_ERROR_STOP -3 - -#define HTTP_UNAUTHORIZED 401 -#define OK 200 - -int check_user(char* user, char* pass); diff --git a/absec_fs.c b/absec_fs.c new file mode 100644 index 0000000..24f0a98 --- /dev/null +++ b/absec_fs.c @@ -0,0 +1,66 @@ + + +#include "absec_auto.h" + +#include +#include +#include "httpd.h" + +//////////////////////////////////////////////////////////////// +// +int mysql_lookup(request_rec *r, struct stat *fperm) +{ + MYSQL *conn; + MYSQL_RES *res; + MYSQL_ROW row; + + char *server = "localhost"; + char *user = "jlcyr"; + char *password = "password"; /* set me first */ + char *database = "absec"; + + conn = mysql_init(NULL); + + /* Connect to database */ + if (!mysql_real_connect(conn, server, + user, password, database, 0, NULL, 0)) { + printf("%s\n", mysql_error(conn)); + return(0); + } + + char query[256]; + sprintf(query, "select * from urls where url='%s'", r->uri); + /* send SQL query */ + //if (mysql_query(conn, "show tables")) { + if (mysql_query(conn, query)) { + printf("%s\n", mysql_error(conn)); + return(-1); + } + + res = mysql_use_result(conn); + + /* output table name */ + printf("MySQL data:\n
"); + int cnt = 0; + while ((row = mysql_fetch_row(res)) != NULL) { + printf("%s %d %d %o \n
", row[0], atoi(row[1]), atoi(row[2]), atoi(row[3])); + fperm->st_uid = atoi(row[1]); + fperm->st_gid = atoi(row[2]); + fperm->st_mode = atoi(row[3]); + cnt = cnt + 1; + } + + if (cnt==0) { + sprintf(query, "insert into urls (url, uid, gid, perms) values ('%s', 0, 0, 0)", r->uri); + if (mysql_query(conn, query)) { + printf("%s\n", mysql_error(conn)); + return(0); + } + printf("Aucune donnee\n
"); + } + + /* close connection */ + mysql_free_result(res); + mysql_close(conn); + return(0); +} diff --git a/absec_mysql.c b/absec_mysql.c index cafa45c..24f0a98 100644 --- a/absec_mysql.c +++ b/absec_mysql.c @@ -1,5 +1,7 @@ +#include "absec_auto.h" + #include #include #include "httpd.h" diff --git a/absec_mysql.h b/absec_mysql.h deleted file mode 100644 index 7669c4a..0000000 --- a/absec_mysql.h +++ /dev/null @@ -1,3 +0,0 @@ - - -int mysql_lookup(request_rec *r, struct stat *fperm); diff --git a/absec_pam.h b/absec_pam.h deleted file mode 100644 index a057824..0000000 --- a/absec_pam.h +++ /dev/null @@ -1,7 +0,0 @@ - -#define PAM_OK 0 -#define PAM_ERROR_START -1 -#define PAM_ERROR_INVALID_CRED -2 -#define PAM_ERROR_STOP -3 - -int check_user(char* user, char* pass); diff --git a/readme.txt b/readme.txt index 005018e..a9beab9 100644 --- a/readme.txt +++ b/readme.txt @@ -9,6 +9,7 @@ Le projet dépend pour être compilé de * libapr1-dev * libaprutil-dev * apache2-dev +* libmysqlclient-dev Un script de compilation est disponible compile.sh diff --git a/test_auto.c b/test_auto.c new file mode 100644 index 0000000..b043945 --- /dev/null +++ b/test_auto.c @@ -0,0 +1,42 @@ + + +#include "absec_auto.h" +//#include +#include + +int main() { + MYSQL *conn; + MYSQL_RES *res; + MYSQL_ROW row; + + char *server = "localhost"; + char *user = "jlcyr"; + char *password = "password"; /* set me first */ + char *database = "absec"; + + conn = mysql_init(NULL); + + /* Connect to database */ + if (!mysql_real_connect(conn, server, + user, password, database, 0, NULL, 0)) { + fprintf(stderr, "%s\n", mysql_error(conn)); + exit(1); + } + + /* send SQL query */ + if (mysql_query(conn, "show tables")) { + fprintf(stderr, "%s\n", mysql_error(conn)); + exit(1); + } + + res = mysql_use_result(conn); + + /* output table name */ + printf("MySQL Tables in mysql database:\n"); + while ((row = mysql_fetch_row(res)) != NULL) + printf("%s \n", row[0]); + + /* close connection */ + mysql_free_result(res); + mysql_close(conn); +} diff --git a/test_etc.c b/test_etc.c deleted file mode 100644 index 5f7e681..0000000 --- a/test_etc.c +++ /dev/null @@ -1,16 +0,0 @@ -#include "absec_pam.h" -#include - -void main(int argc, char** argv){ - char *user = "jlcyr"; - char *pass = "jlcyrpass01!"; - printf("ABSEC auth etc for %s identified by %s\r\n", user, pass); - int retval; - retval = check_user(user, pass); - printf("Retval: %d\r\n", retval); - if (retval == PAM_ERROR_START) printf("Error at start\r\n"); - if (retval == PAM_ERROR_INVALID_CRED) printf("Invalid user/pass\r\n"); - if (retval == PAM_OK) printf("OK\r\n"); - printf("Test completed\r\n"); - return; -} diff --git a/test_mysql.c b/test_mysql.c deleted file mode 100755 index 93eba3c..0000000 --- a/test_mysql.c +++ /dev/null @@ -1,42 +0,0 @@ - - - -#include -#include - -int main() { - MYSQL *conn; - MYSQL_RES *res; - MYSQL_ROW row; - - char *server = "localhost"; - char *user = "jlcyr"; - char *password = "password"; /* set me first */ - char *database = "absec"; - - conn = mysql_init(NULL); - - /* Connect to database */ - if (!mysql_real_connect(conn, server, - user, password, database, 0, NULL, 0)) { - fprintf(stderr, "%s\n", mysql_error(conn)); - exit(1); - } - - /* send SQL query */ - if (mysql_query(conn, "show tables")) { - fprintf(stderr, "%s\n", mysql_error(conn)); - exit(1); - } - - res = mysql_use_result(conn); - - /* output table name */ - printf("MySQL Tables in mysql database:\n"); - while ((row = mysql_fetch_row(res)) != NULL) - printf("%s \n", row[0]); - - /* close connection */ - mysql_free_result(res); - mysql_close(conn); -} diff --git a/test_pam.c b/test_pam.c deleted file mode 100644 index 95198ea..0000000 --- a/test_pam.c +++ /dev/null @@ -1,16 +0,0 @@ -#include "absec_pam.h" -#include "absec_etc.h" -#include - -void main(int argc, char** argv){ - char *user = "jlcyr"; - char *pass = "jlcyrpass01!"; - printf("ABSEC auth pam for %s identified by %s\r\n", user, pass); - int retval = check_user(user, pass); - printf("Retval: %d\r\n", retval); - if (retval == PAM_ERROR_START) printf("Error at start\r\n"); - if (retval == PAM_ERROR_INVALID_CRED) printf("Invalid user/pass\r\n"); - if (retval == PAM_OK) printf("OK\r\n"); - printf("Test completed\r\n"); - return; -}