From e22fffb15fdbf8a4fca7b3db8747caf5c339230a Mon Sep 17 00:00:00 2001 From: jakani24 Date: Sat, 9 Mar 2024 14:29:45 +0100 Subject: [PATCH] updating log entry server scripts --- .../.vs/client_backend/v17/.suo | Bin 128512 -> 128512 bytes .../.vs/client_backend/v17/Browse.VC.db | Bin 64192512 -> 64192512 bytes .../client_backend/v17/DocumentLayout.json | 36 +++++++--------- src/client_backend/connect.cpp | 31 ++++++++++++++ src/client_backend/connect.h | 3 +- src/client_backend/log.h | 39 ++++++++++++++++-- .../cyberhex-code/api/php/log/add_entry.php | 4 +- .../cyberhex-code/api/php/log/add_logfile.php | 38 +++++++++++++++++ .../system/secure_zone/php/view_log.php | 2 +- .../system/secure_zone/php/welcome.php | 2 +- 10 files changed, 125 insertions(+), 30 deletions(-) create mode 100644 src/server/cyberhex-code/api/php/log/add_logfile.php diff --git a/src/client_backend/.vs/client_backend/v17/.suo b/src/client_backend/.vs/client_backend/v17/.suo index 15f18c83f7829fee148bad41031e16ca2de7f795..3ddb7f5eca9c54804a274bf2b6b47bd562eb18a1 100644 GIT binary patch delta 3634 zcmds)eNa@_6~Nzl`}kP1%ZDH`x)D?qP{3VS0VBc+3kp^=2pSXo0v3rO3*zD=#>)E9 z=m>4tJ$7EACY`)mG*!pAuW>adW)W-+YHB*|#A&c?I!-^CIx^^#v`WumcT;OkGD)WY z^v?eF-h1wO=iYbEz31NN90+p`gmoGp6@n>B5F)885%)$$Mpz6d7blAPzx?d#w3c5( z4heiKaErJFR^x4PrznfKMN_JUDryi3yt+0CjiRJKL6ypY;Rpn2eA@()u;EyOY>y;T zJ~dFDO!-)15)nrjhHAeb;us@7OM<2(rfG=drUF*_$lq#2!ry)Y+p!Z;qq#!@LM>MHJu|EfYAx@`p8~zSw)L}yyaOspfoHi5Gq^14f9_xTr*gAHJq@fqY%WG43 z&q5O39@_>}u{EY#EAV`?lY={2$CF3((d1cv8lqUh1eYORT#>6xk=*&#a9#zx|AG(0 zWNgiE6YmIkCx4qbDB$LT@^IdNyg7qPA)`I0!^vTiXHqZ32kj4$&TWG0i9q`OlgrfU z8T}d*oh1^7iJ%48hON#vXvW+0--NB(+ZD6uc38vd$r0ZAK}8&L7_ie(hYrf4TC=by z!i0|24kb7AOS(=-QY?}?`=Z2AA!tq=%GQCq#-JJ+Z-8g|MUZ%j2U~SLRJl%YQp!Tz zHAQOCK_~gCcAi{O2eE2w#el}$5;uA7m3`e~Vnd)lr)u{1jnEq$NG+0bwV}8 zkS2;V8A5|#Yi}GlbfRxXZbSFLTMM4Qd$|2?=gUtdrx{irZ!>jGOC9Yiv_|(|rkVt(|gWw{_>xr%&y_XZ^=;SJU094L@CUAw0UlcG&;G2dgsyEjFv1;evRz zy6zCr@Fcsf)`8$k)1>9h!N;E{lW*q3BN*P9s>{tu%go+dvaWHHZ8MtoE<``RJ z)B22ttuGjj=yRo{Wck}|q|;<)QyI0*&D8oN#Ha4J-Lu7f>%CdW?emXdr>j}nAi7Ij zQ8GoH+GlL`I#yjQtj76C3AFsXOA0hfvxra{CtDPV#24FB)WuJzfIj<#nIF)~;xw8q zt6o~Mq^x*RW$~KDrIl-nsu$1a-?9o0eF7HSU+@=t?Rn^QrC>_aHD&YX_kD)@24zdA zvPV=Fik`h^0JhQ#7pZsKHR3n!UQI!lUg5=|Ml(W^V_*QLr`?h{KB2` zynm;-W{frGq-6!R&)3~C9%~PT03Ub3Q@|gEad_UMhez>pEwIOu`H{e7&mY&zN24rX zpgxm-VW7w1iDg>g`(=@VwRw*!ygr=b%AU4F_+4JA0v&_8;2W zmH!=yzchq<4kd|d(u70^=Sw49IqvIzVux}hPFX4{zEIDRYcPK4N1yybaQ;eZ|50J# z$KMJ2qu_jfUw%Z9dh?BFQRxd+j_L5$V3}Ihe+rb-5?bDg#b2JasFl~EMe(|T>wV|I zASbQ>1D@@!!j{!j@J#mt)p_0rc=>`E2YPh!_7Jej_7aGZ6K6oO{M&3;A?s(rV;K48 zTj;!C`JsiT!FR!ed#a;w=_VtdI&YCTra^+5Fz^Yu_eiSLk_Z1j6GkK4vl8g#hDi7c zzI%7KeBwh0m5m2Li*K%!ju7=s`7&%w2~ zBzehr2=o5S;kxD8%&3Ftt!RDtgsM{+($Je?Nu_E$Lhyq!-$ zjpQA?4iQpU14PN0%VD{9`R~C##@o9C@KQLb16+q~O4U`L4FL0=9}(-#GQ rccgmtFG4ZM;!Chg-nJLwoOnwSLX_b$7}jKs13 zwRh&T_q_A&uXDfmo(CO+5gmgOJy}x(U8tCKx*0GfaCc;6gnPx~E0Tq1Z_==>`7+Ii z!?}jF3awPZZVBHP%pz+Qi%hy_@InvRhZS~~B}maf#Y4#y{Gb>aNeS%>VDW*IKpepM zBgv>Ihiv{F0XrU8z;rMRM1cu_54ITacEbQ`4KA_}^*E3Ro&a+|7U1o8NrfG&)3xjF zz?cNmKsp!?c!NyT6G1MR2Ihi=zyNH(1Revt?c=Byf!QDfWP|SjJ17D^&Mk#!Ehq!)zZH?X7S=`Q4>*b}Ol!)-kVjrHS~` z_^k=w?5J>JfKMk+7+_0dvelspAJC`~7bOP#E;90+<3}Ofjd_lA%ZZ<)f zlV*}?&-{z13Ty6?Z;l|l&P)6tg?p$&t|*fI4%Lx+SuZCSPhCsR!p&8c ztbf=kZ`g19d&R-_;$6{}lx>e)s%riD(Q&PGAXc1zA#LmGsfQAO=hoqbO;j&!$RS^a zAQxDeW!3bc>Yi2Iq~uhSOUdk|M76B?5CzJXBK$>IFHfD}@R?^_w{MLg`|YazyI06p zAdrr28_r`L!%o)Wamt=a?6SupB9SoBJM3!`0@t0yI{xXTZUoUT&vP01_ke#V?u|J# z&%%1?X=?!-&0N8?*k{%i8J8swb9dl#abd2`ySncc$gCgz>pWiF+}wEZ=A zYbGxL&8(j_P+lNSD9SjJGQzfg6hiGB~{vWQe=m{liAZd($wJ{qM+x8 zu8Uvc-XY?N2hPE=QTOmM#Wfw+O0b|4}k7#P;NZ@cGnt z;K8WgnR(%%>C7&>Ml%op(o>@&<823xd-XTs3;(U(y?5o?e+&%xpLsd4w4>N@O*k;eU|qi;c-)zL_3f|j z*Vj_TPMhiDA6x%W*6iDLc3SoNCU-(t=X#+t`sAPAnR@#9Pa4bL86BZuc;VPdrARfs z|Eb=0B2vCqqt^5vAa>)XTXkRQBi|Y6e`kfHY||rkHLRkEO7aYvuKaZ|J*z~|poMJw zKW?y1UszS^#lMlVDV<;qa_cE-R`OQT0MmwEQQA_Ge=mG6H<*k!N)*j%zu2erB#}jV zH-cVKe(@0*l&k|}VsCAhl%l-R8G6;Un}0I#9nstd>Wg4+UbScziLPNe=O``sHaLi8 znM8S_vi4gPW#ajNE^w*at~^fKu_P)H*^T#Gw3bBLMgAO;SnSnfLBF0=)>`=5tlFYf zI!k^BMf!6=0SSF>5)DVh#Uv?1*%YhAl~OwH@3*O6$$X`JZP4bU6N?!%t6t$am6l3() zl3CfXfwHu$X8OHe`2_!6XogPuT=aL6!G9e=6<1N4*49m(`UeuVLQhdaY%}(7w50Sa zFx*PpOzL9hjV9$if<6n<=~-qSj8M)HrHwOso2n~4HJP1BpOc!14eees~opdH`hN>d;5p9tn5Dzlaet2 diff --git a/src/client_backend/.vs/client_backend/v17/Browse.VC.db b/src/client_backend/.vs/client_backend/v17/Browse.VC.db index 8c378a35003e18e42ed78e1e4db75cdcfa441a9e..1021a5582065a533cde66cb72df81aa48b5aa985 100644 GIT binary patch delta 9799 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 delta 9207 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 diff --git a/src/client_backend/.vs/client_backend/v17/DocumentLayout.json b/src/client_backend/.vs/client_backend/v17/DocumentLayout.json index 95fa152..147c002 100644 --- a/src/client_backend/.vs/client_backend/v17/DocumentLayout.json +++ b/src/client_backend/.vs/client_backend/v17/DocumentLayout.json @@ -6,14 +6,14 @@ "AbsoluteMoniker": "D:0:0:{56E65283-AAC9-43F6-9613-72BE8D648AC4}|client_backend.vcxproj|C:\\Users\\janis\\Documents\\Projekte_mit_c\\ma\\ma\\src\\client_backend\\log.h||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}", "RelativeMoniker": "D:0:0:{56E65283-AAC9-43F6-9613-72BE8D648AC4}|client_backend.vcxproj|solutionrelative:log.h||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}" }, - { - "AbsoluteMoniker": "D:0:0:{56E65283-AAC9-43F6-9613-72BE8D648AC4}|client_backend.vcxproj|C:\\Users\\janis\\Documents\\Projekte_mit_c\\ma\\ma\\src\\client_backend\\connect.h||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}", - "RelativeMoniker": "D:0:0:{56E65283-AAC9-43F6-9613-72BE8D648AC4}|client_backend.vcxproj|solutionrelative:connect.h||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}" - }, { "AbsoluteMoniker": "D:0:0:{56E65283-AAC9-43F6-9613-72BE8D648AC4}|client_backend.vcxproj|C:\\Users\\janis\\Documents\\Projekte_mit_c\\ma\\ma\\src\\client_backend\\connect.cpp||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}", "RelativeMoniker": "D:0:0:{56E65283-AAC9-43F6-9613-72BE8D648AC4}|client_backend.vcxproj|solutionrelative:connect.cpp||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}" }, + { + "AbsoluteMoniker": "D:0:0:{56E65283-AAC9-43F6-9613-72BE8D648AC4}|client_backend.vcxproj|C:\\Users\\janis\\Documents\\Projekte_mit_c\\ma\\ma\\src\\client_backend\\connect.h||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}", + "RelativeMoniker": "D:0:0:{56E65283-AAC9-43F6-9613-72BE8D648AC4}|client_backend.vcxproj|solutionrelative:connect.h||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}" + }, { "AbsoluteMoniker": "D:0:0:{56E65283-AAC9-43F6-9613-72BE8D648AC4}|client_backend.vcxproj|C:\\Users\\janis\\Documents\\Projekte_mit_c\\ma\\ma\\src\\client_backend\\virus_ctrl.cpp||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}", "RelativeMoniker": "D:0:0:{56E65283-AAC9-43F6-9613-72BE8D648AC4}|client_backend.vcxproj|solutionrelative:virus_ctrl.cpp||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}" @@ -74,13 +74,13 @@ "Children": [ { "$type": "Document", - "DocumentIndex": 1, + "DocumentIndex": 2, "Title": "connect.h", "DocumentMoniker": "C:\\Users\\janis\\Documents\\Projekte_mit_c\\ma\\ma\\src\\client_backend\\connect.h", "RelativeDocumentMoniker": "connect.h", "ToolTip": "C:\\Users\\janis\\Documents\\Projekte_mit_c\\ma\\ma\\src\\client_backend\\connect.h", "RelativeToolTip": "connect.h", - "ViewState": "AQIAAAAAAAAAAAAAAAAAAAoAAAABAAAA", + "ViewState": "AQIAAAAAAAAAAAAAAAAAAAsAAABPAAAA", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000680|", "WhenOpened": "2024-03-09T12:32:01.859Z", "EditorCaption": "" @@ -105,7 +105,7 @@ "RelativeDocumentMoniker": "log.h", "ToolTip": "C:\\Users\\janis\\Documents\\Projekte_mit_c\\ma\\ma\\src\\client_backend\\log.h", "RelativeToolTip": "log.h", - "ViewState": "AQIAAFEAAAAAAAAAAAAAAHEAAABCAAAA", + "ViewState": "AQIAAGYAAAAAAAAAAAAYwJMAAAAkAAAA", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000680|", "WhenOpened": "2024-02-25T09:02:55.874Z", "EditorCaption": "" @@ -120,8 +120,7 @@ "RelativeToolTip": "log.cpp", "ViewState": "AQIAAAAAAAAAAAAAAAAAABkAAAAeAAAA", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000677|", - "WhenOpened": "2024-02-25T09:08:59.07Z", - "EditorCaption": "" + "WhenOpened": "2024-02-25T09:08:59.07Z" }, { "$type": "Document", @@ -157,8 +156,7 @@ "RelativeToolTip": "thread_ctrl.cpp", "ViewState": "AQIAAAAAAAAAAAAAAAAAADoAAAAqAAAA", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000677|", - "WhenOpened": "2024-01-28T20:40:06.264Z", - "EditorCaption": "" + "WhenOpened": "2024-01-28T20:40:06.264Z" }, { "$type": "Document", @@ -170,8 +168,7 @@ "RelativeToolTip": "client_backend.cpp", "ViewState": "AQIAAAAAAAAAAAAAAAAAACwAAAAiAAAA", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000677|", - "WhenOpened": "2024-01-28T20:40:06.279Z", - "EditorCaption": "" + "WhenOpened": "2024-01-28T20:40:06.279Z" }, { "$type": "Document", @@ -183,8 +180,7 @@ "RelativeToolTip": "scan.cpp", "ViewState": "AQIAABgAAAAAAAAAAAAAAA4AAAAVAAAA", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000677|", - "WhenOpened": "2024-01-28T20:40:06.248Z", - "EditorCaption": "" + "WhenOpened": "2024-01-28T20:40:06.248Z" }, { "$type": "Document", @@ -196,8 +192,7 @@ "RelativeToolTip": "update.cpp", "ViewState": "AQIAABMAAAAAAAAAAAAkwEQAAABzAAAA", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000677|", - "WhenOpened": "2024-01-28T20:40:06.248Z", - "EditorCaption": "" + "WhenOpened": "2024-01-28T20:40:06.248Z" }, { "$type": "Document", @@ -237,13 +232,13 @@ }, { "$type": "Document", - "DocumentIndex": 2, + "DocumentIndex": 1, "Title": "connect.cpp", "DocumentMoniker": "C:\\Users\\janis\\Documents\\Projekte_mit_c\\ma\\ma\\src\\client_backend\\connect.cpp", "RelativeDocumentMoniker": "connect.cpp", "ToolTip": "C:\\Users\\janis\\Documents\\Projekte_mit_c\\ma\\ma\\src\\client_backend\\connect.cpp", "RelativeToolTip": "connect.cpp", - "ViewState": "AQIAAG8AAAAAAAAAAAAAAIMAAAABAAAA", + "ViewState": "AQIAAJUAAAAAAAAAAAAQwLsAAAAaAAAA", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000677|", "WhenOpened": "2024-01-28T20:40:06.315Z", "EditorCaption": "" @@ -258,8 +253,7 @@ "RelativeToolTip": "virus_ctrl.cpp", "ViewState": "AQIAADYAAAAAAAAAAAAAAGEAAAAvAAAA", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000677|", - "WhenOpened": "2024-02-18T12:49:41.861Z", - "EditorCaption": "" + "WhenOpened": "2024-02-18T12:49:41.861Z" } ] } diff --git a/src/client_backend/connect.cpp b/src/client_backend/connect.cpp index 4ebac91..90195e8 100644 --- a/src/client_backend/connect.cpp +++ b/src/client_backend/connect.cpp @@ -164,4 +164,35 @@ char* url_encode(const char* input) { return encoded; } + +int upload_to_srv(const char* url, const char* filepath,bool ignore_insecure) { + //upload a file to the server + CURL* curl; + CURLcode res; + struct curl_httppost* formpost = NULL; + struct curl_httppost* lastptr = NULL; + struct curl_slist* headerlist = NULL; + static const char buf[] = "Expect:"; + curl_global_init(CURL_GLOBAL_ALL); + curl_formadd(&formpost, &lastptr, CURLFORM_COPYNAME, "file", CURLFORM_FILE, filepath, CURLFORM_END); + curl = curl_easy_init(); + if (curl) { + curl_easy_setopt(curl, CURLOPT_URL, url); + if(ignore_insecure==true) + curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 0L); + headerlist = curl_slist_append(headerlist, buf); + curl_easy_setopt(curl, CURLOPT_HTTPHEADER, headerlist); + curl_easy_setopt(curl, CURLOPT_HTTPPOST, formpost); + res = curl_easy_perform(curl); + curl_easy_cleanup(curl); + curl_formfree(formpost); + curl_slist_free_all(headerlist); + if (res == CURLE_OK) { + return 0; + } + else { + return 1; + } + } +} #endif \ No newline at end of file diff --git a/src/client_backend/connect.h b/src/client_backend/connect.h index 09f8dc5..a2cd56d 100644 --- a/src/client_backend/connect.h +++ b/src/client_backend/connect.h @@ -8,4 +8,5 @@ int connect_to_srv(const char* url, char* out, int max_len, bool ignore_insecure); int download_file_from_srv(const char* url, const char* outputFileName,bool ignore_insecure); int fast_send(const char* url, bool ignore_insecure); -char* url_encode(const char* input); \ No newline at end of file +char* url_encode(const char* input); +int upload_to_srv(const char* url, const char* filepath, bool ignore_insecure); \ No newline at end of file diff --git a/src/client_backend/log.h b/src/client_backend/log.h index 8db41f1..f588513 100644 --- a/src/client_backend/log.h +++ b/src/client_backend/log.h @@ -9,6 +9,8 @@ #include "well_known.h" #include "settings.h" #include "security.h" +int srv_timeout = 0; +int timeout_reset = 0; enum class LOGLEVEL { INFO, WARN, @@ -26,6 +28,7 @@ std::string get_loglevel(LOGLEVEL level); template void log(LOGLEVEL level, const std::string& message, Args&&... args) { + timeout_reset++; std::string prefix = get_loglevel(level); std::time_t now = std::time(nullptr); std::tm tm; @@ -92,8 +95,8 @@ void log(LOGLEVEL level, const std::string& message, Args&&... args) { fprintf_s(fp, "%s", logString.c_str()); fclose(fp); } - //write to server log file - if (fopen_s(&fp, SRV_LOGFILE, "a") == 0) { + //write to server log file only if we werent able to send the logs directly. this file will store them until we can upload them + if (fopen_s(&fp, SRV_LOGFILE, "a") == 0 && srv_timout>=5) { //if server already did not respon over 5 times, we add it to the log file fprintf_s(fp, "%s\n", to_srv_string.c_str()); fclose(fp); } @@ -102,8 +105,9 @@ void log(LOGLEVEL level, const std::string& message, Args&&... args) { //build up the log string: loglevel&logtext&machineid&date //to_srv_string=includes the log message //we now need to build up the request string and append the machineid - if (level!=LOGLEVEL::INFO_NOSEND && level!=LOGLEVEL::WARN_NOSEND && level!=LOGLEVEL::ERR_NOSEND && level!=LOGLEVEL::PANIC_NOSEND) { + if (level!=LOGLEVEL::INFO_NOSEND && level!=LOGLEVEL::WARN_NOSEND && level!=LOGLEVEL::ERR_NOSEND && level!=LOGLEVEL::PANIC_NOSEND && srv_timeout<5) { char* url = new char[3000]; + int res = 0; if (get_setting("server:server_url", url) == 0 or strcmp(url, "nan") == 0) { strcat_s(url, 3000, "/api/php/log/add_entry.php?logtext=");//need to add machine_id and apikey strcat_s(url, 3000, url_encode(to_srv_string.c_str())); @@ -111,7 +115,11 @@ void log(LOGLEVEL level, const std::string& message, Args&&... args) { strcat_s(url, 3000, get_machineid(SECRETS)); strcat_s(url, 3000, "&apikey="); strcat_s(url, 3000, get_apikey(SECRETS)); - fast_send(url, get_setting("communication:unsafe_tls"); + res=fast_send(url, get_setting("communication:unsafe_tls"); + if (res != 0) { + //we know that the server might be down, so we will increment the timeout counter + srv_timeout++; + } //we might not want to log an error occuring here because it will create a loop delete[] url; } @@ -120,6 +128,29 @@ void log(LOGLEVEL level, const std::string& message, Args&&... args) { return; } }//else we do not send the log to the server + if(timeout_reset>100){ //after 100 log entrys, we cna try again to reach out ot the server. + timeout_reset=0; + srv_timeout=0; + //try to upload the server_log file, where we stored the logs which we could not upload. + char* url = new char[3000]; + int res = 0; + if (get_setting("server:server_url", url) == 0 or strcmp(url, "nan") == 0) { + strcat_s(url, 3000, "/api/php/log/add_log.php?machine_id="); + strcat_s(url, 3000, get_machineid(SECRETS)); + strcat_s(url, 3000, "&apikey="); + strcat_s(url, 3000, get_apikey(SECRETS)); + res=upload_to_srv(SRV_LOGFILE, url, get_setting("communication:unsafe_tls")); + if (res != 0) { + //we know that the server might be down, so we will increment the timeout counter + srv_timeout++; + } + else { + //remove the logfile + remove(SRV_LOGFILE); + } + } + delete [] url; + } } diff --git a/src/server/cyberhex-code/api/php/log/add_entry.php b/src/server/cyberhex-code/api/php/log/add_entry.php index 4657ea2..01e2d9c 100644 --- a/src/server/cyberhex-code/api/php/log/add_entry.php +++ b/src/server/cyberhex-code/api/php/log/add_entry.php @@ -16,7 +16,7 @@ else{ $message=$log[2]; $loglevel=$log[1]; $machine_id=htmlspecialchars($_GET["machine_id"]); - $time=log[0]; + $time=$log[0]; //include db pw include "../../../config.php"; @@ -26,7 +26,7 @@ else{ } $sql = "INSERT INTO log (loglevel,machine_id,logtext,time) VALUES (?,?,?,?);"; $stmt = $conn->prepare($sql); - $stmt->bind_param("ssss", $loglevel,$machine_id,$logtext,$time); + $stmt->bind_param("ssss", $loglevel,$machine_id,$message,$time); // Execute the statement if(!$stmt->execute()) echo("wrt_err"); diff --git a/src/server/cyberhex-code/api/php/log/add_logfile.php b/src/server/cyberhex-code/api/php/log/add_logfile.php new file mode 100644 index 0000000..ac6aaf7 --- /dev/null +++ b/src/server/cyberhex-code/api/php/log/add_logfile.php @@ -0,0 +1,38 @@ +connect_error) { + die("conn_err"); + } + $fp=fopen($_FILES["file"]["tmp_name"],"r"); + while(!feof($fp)){ + $log_entry=fgets($fp); + $log_entry=str_replace("\n","",$log_entry); + $log=explode(";",$log_entry); + $message=$log[2]; + $loglevel=$log[1]; + $machine_id=htmlspecialchars($_GET["machine_id"]); + $time=$log[0]; + + $sql = "INSERT INTO log (loglevel,machine_id,logtext,time) VALUES (?,?,?,?);"; + $stmt = $conn->prepare($sql); + $stmt->bind_param("ssss", $loglevel,$machine_id,$message,$time); + // Execute the statement + if(!$stmt->execute()) + echo("wrt_err"); + else + echo("wrt_ok"); + $stmt->close(); + } + $conn->close(); +} +?> diff --git a/src/server/cyberhex-code/system/secure_zone/php/view_log.php b/src/server/cyberhex-code/system/secure_zone/php/view_log.php index 5ed929a..163b804 100644 --- a/src/server/cyberhex-code/system/secure_zone/php/view_log.php +++ b/src/server/cyberhex-code/system/secure_zone/php/view_log.php @@ -29,7 +29,7 @@ if($perms[2]!=="1"){ -
+
diff --git a/src/server/cyberhex-code/system/secure_zone/php/welcome.php b/src/server/cyberhex-code/system/secure_zone/php/welcome.php index aa30cb9..8df2acb 100644 --- a/src/server/cyberhex-code/system/secure_zone/php/welcome.php +++ b/src/server/cyberhex-code/system/secure_zone/php/welcome.php @@ -22,7 +22,7 @@ $email = $_SESSION["email"]; -
+