From 6c668aa6e0d3706ef7cd714b1242e743f2b7eb9b Mon Sep 17 00:00:00 2001 From: Zakaria aourzag <29924334+zaourzag@users.noreply.github.com> Date: Thu, 18 Mar 2021 23:36:17 +0100 Subject: [PATCH 01/13] Update server.py --- server.py | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/server.py b/server.py index 2b0ddc6..85a1ec6 100644 --- a/server.py +++ b/server.py @@ -4,10 +4,11 @@ import secrets import traceback from os.path import splitext +from werkzeug.utils import secure_filename import pymongo from PIL import Image -from flask import Flask, request, json, jsonify, render_template, session, redirect +from flask import Flask, request, json, jsonify, render_template, session, redirect, send_from_directory from flask_session import Session from pymongo import MongoClient @@ -86,6 +87,12 @@ def create_new_user(uid: int, name: str): def datefromunix(s): return datetime.datetime.fromtimestamp(int(s) / 1000).strftime("%Y-%m-%d %H:%M") +@app.route('/favicon.ico') +def favicon(): + return send_from_directory(os.path.join(app.root_path, 'static'), + 'favicon.ico', mimetype='image/vnd.microsoft.icon') + + @app.route('/') def index(): @@ -121,7 +128,11 @@ def my_portal(): activity = _db.images.find({"user_uid": session.get("logged_in")}).sort('created', pymongo.DESCENDING).limit(5) activity = [x for x in activity] return render_template("my_portal.html", domains=allowed_domains, total=total, images=activity) - +@app.route('/i/') +def return_pic(filename): + """ Show just the image specified. + """ + return send_from_directory( _config['storage_dir'], secure_filename(filename)) @app.route('/my/files', methods=['GET', 'POST']) def my_files(): From 350e63d620866e1f4643dd1377202de6d37a4001 Mon Sep 17 00:00:00 2001 From: Zakaria aourzag <29924334+zaourzag@users.noreply.github.com> Date: Thu, 18 Mar 2021 23:37:07 +0100 Subject: [PATCH 02/13] Create temp --- static/temp | 1 + 1 file changed, 1 insertion(+) create mode 100644 static/temp diff --git a/static/temp b/static/temp new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/static/temp @@ -0,0 +1 @@ + From 71ee08013659befc786ab635295343a4c5a812e0 Mon Sep 17 00:00:00 2001 From: Zakaria aourzag <29924334+zaourzag@users.noreply.github.com> Date: Thu, 18 Mar 2021 23:37:43 +0100 Subject: [PATCH 03/13] add favicon --- static/favicon.ico | Bin 0 -> 102868 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 static/favicon.ico diff --git a/static/favicon.ico b/static/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..0dec7f18144364d2410cf2e80f3cd790b6d7528d GIT binary patch literal 102868 zcmeHQ30zdw_kSY{%m6Y2vw;6hNHooUh32oHd*D{7C2B5}3Tke-A}%nZg7s6}z|?Rl zcT;gmTYmn`1jQv$RH$F2sii0&ZYcsT$iV#1c{6uBJRD#Y5tuih&v)**Gwrg19iArPln`QiBkehEOtgfX+oStiwVnRY36ieeo;Qxjpgnz8i_IH>bX^t83@}4Y&77Y|?mbkW;wwR#-jA|52YSqxGYLxP$X*_x!j}6R>M*d=J<4O?-Fk z&3SWrQBKtFMfTahciuW(!flPJ#kp+YxI>M(#HLPM(*>sJkl*)lBX1vw@>-vB#OsZ3 zyJxn~&G>a_y(_sMU&MSi(c$@pt0K0voiXJ?(EiyA*yN&3+g6WzPuKL)_PI@V4m~t*P0;4tO9kgH^v&P5^w`wyYd;^+eeJv- z>>kMtGIyDq`oZ=Y+3T8&|6*6*&fFFOtJdapJwHK`8GQQIThHryW##W56VWa6`J1g~ z?w=Lz*rU{>I?UVrWk&0W^zFN1CKtUFvTFaI8(ZA;-It#+CAQI9C)<9I8QZI8JwLvD&t~;KKxwX%EYZNosj3%zgbddOoXktsIbEJQCs3~U#kttA4?y0 zGi>$#iGTg6&3_OPe>Xf<5vV`#X6&+gQx8S@E_3;EUC!a#9x=W16T2-vzbV9T(}jql zgt6hh&wo2=>qp(a?=6Zl%x_a%J1i$q*8Ew1oeWy9u%j27jE|pM=n(68sL`tRIb9b9 zj<_`{=>ETxC${PDv8C!(AoaB+7mNWUA!wuhAWQpAUQY-1kisF{>Ki z`(4rXfxeyZg$p}!Zv1yxi>p3i1DoVsf9=P^cT$~NN@EvaU)ZVhtUZ5?&X~dNNLQ@9 zon5<0K+N(h%T-|?CnT@h-=@c_zvY#h=l(Tzb52JM$ns11Hf5(*R_KoJ8wD)?SFg zf5U23n(M>rP6UdL;eo!c|Foai?U-J0u6I2bzv;|IFX>_vw9>?#ozq zdRyBw)6ROvo_?^Bv)o?#-f0yHwdX<)UHa=|pX*bvZi|ZzV*6$6JQp5#dgAF_Tifp4 zkU1qb%MkzZkIBysAOGQ&oIeIf9WQiwEjQ@Q+MI*8mbQJ>Z_SWn-wyU~aP7|E_Urnm z%5MaIeNQ##%FeI{>w^aD%=vIlX+@uUZ}9lkTz5w=pVRq@FY=cMW_j(n_jl-y+}(vk zcO`#+Zkg|-_*uRk5)2=uEZ>kbTj#sI$DW{NU5~16q+Sc~UbgZ&BLW>K2mSv)y zar%Cz2eMeN{|-9dyvfeG;qwBsQm^KQj$K|5m;8Oi$b^AjFZ|g$;{Dqj8lCK`8-9L% zh@Zr7W0rlb{C_57>4qf?^uKp@#qKTfIhjdqGVXL&K zu6Dr2oaCa#1FrtHf81T4CaDQ~F1zYxw*T4fZo9tk>972{v(KK1-MxD@@<_Hz=z6nr z-H7@tgVqLKm{30>|M`gy?Z55OL)UQe&jqiy>~wAN`EQ5y*_-_9&VR)B&RjD&?`RjL z+PmDwAw8GPxvsl8Cot~Ld!J^s-sJV}q~pIXtLsd(u`VxFKupAd&o;kq2DZXlz%cW<#=bEWZ!5P?;Dx@y4vOW zWe+TPrKuyA7V(Io0@}_u+4HyG&fDE*<%+$!gybbYM;7+drM*A==Gh;v42~TU6w&GC zXfO4TnYrf+2kPT)f8Trciv1fqXUWVeY^0% zgVwRj?#Wb7)hk)*uHk-RdsV9yUhiIOHB;9gy0?>?qx1oSc(j`rb=3NR=u^YW%JX`8U^dGe$;ygx4%vH%dsPN?~LzUZ~v(* z`OPKneqV<2kYu?MrUQ@-e0xN_u8+ixluno|HzpH=5WW*id!~v$nts3{myUCvhUt9 zy;JPoEchLHZxUAkzJfE}1Y_X#+EgQ&CVY zHV%08#JPpf>z_|Z@q6H?h-=&I@4$qVTP-8Toj%g8iC^U8BEMNW!>$<1Q-P0My|<6l zH`a`}9KZIS%ClAHRC({bt9#Gg8q-skdN;Pk(e$jl8W^rqRw=f&op2!aPV0!ZJNza&PUie(Xn#8#8k0hrb-(1)(HFTQYC(BbNwmEmc zw=V08Iy)v8g(|X_bnq=@s9tV&C0##sYFx78$+K}#>UNV?ww?LWg`yj-z{ju6cg8x# zeGaoPMY`qo2}#_`yXD#-HKE|uSjWGDKJOj)$Ah$9Nz&}L5q?K3SH@1!SI9y#@Iyj65abq#;-(z$!59UTUJ(irGS`~e;=@ae<& z!6yyzBT7J&fG7b`0-^*&35XJ~EeXh6)piteSG7HbZAruSN=tQ*G}S%QwkHwWDzT`4 z+tRnNw4(ln5~8S3Jrn*O(>K4WQdA>R z*d(h|_efLSBVA1QSQm)yk*2ywn(7{Dn-pp_DzvEoYNV{Ez^bVKry$fSoFw$g-W0n> zD2`AVR%i{yums{1pTihHu^j#<5RL~R3UPg)3e^Xyd!(uEkuIittP524NK@S-O>~d6 zsQ)UY>_@O7>i-c!v7w(t{o9bTp{Stm`V@OcDv~G+E1(ajSPFeSfv%JDqGEX4eSwa^ zu)Ge80TjjO16zY!Pf!3$_)JJ)TMDV<(o)?cO?8iSG2LT5Ai77onC`JI5ZxnPT=!TH zMEzH?ic8H-)PJessque``mgaSE>=LP9ao=X&&SH66earmWzb&}OzZ3%OQDoW94Lxq z29fDqRr4tfD_{(u5RM0fU_L+qNzl1~xLzz2u$6JDd!(uEkrwrDr9i9M<)Z$pnZhcV zT~YrPEYK>R9L(>0D1L-Ko}xs5FL=HS@8qc0jm)rumC`nN(@HQ-X1-}zAN9i==*QC5Gi zgYlk1E|oY^JgJCYsbeppi0r1CM`4JqQ&bFs^#Pa*oTLDL;JmnEcv2Rt_5D=$NK@S- zE$Y8otG7(%Mg5m4q8fdHsQ((R-V%j#fIglgev~qqqOATttfSLn3MUxvDN1Dclz&(^ zQ1vZ^aKBl&f4qIL>q!b=&!*-BRQE_z-6JjP|0!44XPmsKf3f}3Iv}?Hn%)0{t{YG! zj8-0}D678@?dY_K0>*j=ipuWJ{CuPzQe6I2b&bOCIoKai2=*r)F&{{Q`G6Tvo@N46 zb`dKyKdO7AsqT>$_5V=!SPulc$GT9hKcfDjKcIbpV11CbeNq1%oeX6i~mb)%t*_e^LLm4$!ubw6MJh`$yXLkrvy(*#2o9 zsO<5c_WelHz8`5}eWras(zNeKx>(%17AVC%1Q6NI`Xt zbY<(iwYM~o0(5+rLRg-wv(z^z{#DPuD}|8%Spn)OiW2sOg7XSsE|5Y2=~b!q0jhhX zsqT>$%1hM0sDD}qXxm3xZ2$0#NcsTU_K_CbzpzKG*f{O`k*0k=(!&0X_WelHz8`5J zceL+Ey1MoM3YnxKMdBFcNeZESXj?~mQhTQu3Ks{71BFmtPdncB1!)jP-U7{C3hGOU zbXue;lj0>0`!^}9<#+1as!u73KKIm92fbtfT6;BZ`$*HakF?nSi%V2&|F+ftyGXegDGrWRo}?(NzlSxvXbNW- z?07}#7EP0>JY_b$ahJnef@yr{A3Me(wy zT>wQxjeSpwjf2z)6lI-H2Xlc`3Yk6EoZ?9(N_CGk)jiUp{zd&4s{?}lPTKa7rfnbT zC#|2>-cQ>;(zNX(P1`=wwCy8J+dk5??ITUwKGL-9BTd^r(zNX(P1`=wV*9sN!=+y@ z>c4dP2>*@gX1|U?cz(Kmk*0`ZTswITg`>U1o=1*H9e!mtqdp&-2RdoEw zMg5EVr*(j~eWYpIN1C>Mq^+%gPkKFV`$*HakF?nSOP8?N{%yPeU(!RihQhECY%~c9 z7HWzp2E8s@LIG>j3X0Ne+mrv>zJYWo#ocJleTow8osO+YFM{$FgD1oZ76bhxSOWJ` z2-3=r_Ql7@wxso`R-@^sCRw-lB*La@$K$V!RUAi-L_^GKG_r^Pv!k%jziA zJy2pAzbdNOEJ<_87#r99@0B!q7)3%Sa*#1lJvS{CrH0}G57W@CwK74ovVoN>SE$FshAw zIR&JzqUiFH!*GiGF`5Sy#cYq@eQ$q;yI-Oh)WT&3ML~>*o}w@Y_Us9~-0XT%2+M12 z+}){`14U>Dr-c+k{|I4u;Mx8-g@c_0&Qp2_Yx$|@>#6RMrn*O3)W4|zVs(H#3*d7B zZTm<={S@0jd4DNw`$*Hak90-1XKT|F+kfd2qkTWpwC_i{y7&LW(tEf{>r(6s_B=vS ztS`X5>lj!cAo!wh?RbjZIqJIq-k9E7M_xD153*(~x#r99@fY|%o{$ zAxuvguk9$2QiS-)qbW+1r-t?SLU{<|RQE_z-6JjPziO}V2=!@gT-1Nfp6``aA4L7z zw*H0nL*)YV0fG|y$ID?&fP(nqqbA7nie=fkvD}}ctnt5*)~+W-vBV&v zb*?3)nBXUmp(ty-hcj|cP*k<`JYjh&I!<+uw5b1wdpT8MJ-4FuElf|;zu5k19T3~U zZMA=4f1s@`txHkX^PwJX_6dUDkguYE^j#=k_maIqQP%qZ%bxadKF>oyTD2(PjM4=Z zWsdh_p}i9b&&!3hZTdrXkF=?I8-Y+Ji!m!9e# zX{vjqMg5m8!|Hs6sQ>D$y(i~g)c=#quqLITc9D8e>>2BMfI>JP6oCyN#p(|g2PyIw zXdh7I&4Kgw2v+s09Zz9c1onv(CCB@dFy5O1XPh;ps7bnb7GOtRlXX?hNz{K;)XKBt$<5i`gW`uVo(CvO*prd7i1>4f9(9Hu{cSOK>lHpNKwp| z5bX--SpO(maK7Hbac(ITFvh<~VO!F!dZnehN1Ey$X;J@GPiGa$k*NQQlxFoyOVoe$ z)7jJHxUQR2O96Yv`zeI$#lrK|4vkZ$P$=b+7b%`5?_%0dE&-~0q^a(a7WMz+GOo%g zi2AR}+IjlCiTZ!~GOkWJzzfIfP;46L{2j%{52d>(>^QCwMRh8x$ZJUnP~9Uq3&fVFYd8D+rAIAm9h0c+!MH{9}&0W0HJ zS_DhL+BjrqFz{c-6s(M!vNkhdZQPhM++~u0m2q=+CI+mHo3n!(vHVuX&Dkm7PEdih zadUP+Jk$fE!hZ-m7UQUQ)8)W`Q3_VZS$6DxtK!DWW6aUSFUy|Qt5V`9FU*cFgh_tZ z#97gqq^ypc%E}anA%4mo#|#y4J>J8Atc^p4a6f(<@3%J2N^HvhVP!BTS9aV~VpH~f z6^1e}cFK;M7+~4449g$q88ByW%Fv29&%nd%j0{*4e<*z8UDn2d0h%2$U|qcU)s+}) z42t##L;@t7H+;j#pZ^xWLjm zAVB=Dno!A_sNC#qwfruQ5^uy0BNaa(3}1rJ76RWD2iOwidK_V2i}OWPu2!CYZnj!} z(4{wG_Xx!igxM~io$dEI=pSM7&tvrfG*Tn_16wUWl)FA+&qzfQ!tB4l)cD>ET_@*7 zJl=L+paU3|*MT~Kfd2togIrG_pdMgfQ0@8yTP?rTj;oK@^Ren_rY3wBk-P@}92w{J)4e9`*s@4NrEkD$EAH?2K%3}zj-gTgJgj_0dL@<3@3SX&X zFF{0hQ_VvdV(S#~F!cve2Tmg3{-!2aN~%(Rx7G4HfX)%|qm;=Aq29wfIxR*xfzA<+ ztBiF6Ro^1a?_)64gYAP|Pa;fp0P8}fer&b;Q0@kZgwe|52%+9XJ31{wfX*EdkE;|v zAL)mP%b%*QAq?z&p{DVK%@3dsq#z)lW+pstmgTz7R?E-Iy$^Jb5bAwO2dB>vPpbD; zUebYx-1(Y22$oNJgz5@n#rvu_1dIs=9;W`_>%oeX2vFiv85eA|{Or9p@c!}>2&NC# zAHzFy79yTh@2$P1fe6s~T?EVL>MZpQ#J}p5Jd_?BH@}LEZuMEcUvvLi+ z8FY@YB)_tLZ&zPB7;$HT<{pB*f8+LC^kw>xUcX3Fgc#RO9)o~0 z((Dms$&PC#`1cI!y$E&5Ul<1XDq{+%OhILmmxrY?j~3gCI5Se2GU`Od(oPF1ncLqtsC1r zwt0=A-)l}`h?XzN+9BHb$o)-d4`KT@^^NGzNZua7u6y-4*;|OXAh*2;bG7r>k~ z8Q~=5d=RBF3xC>r`I&qgY8;+Ju=lu{>%kJx8vw?F)d;x$k@cWsLx%>x9RKmHl+ehD$Ch06>?L5znUQ3&sK zLBPA&dLmf9mO^)@S`LWN4o(XZ?0JOc18w~{g1vv;Qaa`R-PX&`)iiBH1V+aN3i=lyeRiauz4HPe?4gX2zDI{ zYdcD$h!8({G{T&Z>HQ5A-QHQgmO@)EKa&f4*SmRsfM;+cVqyITFsrNc*9f>?X##(1 z=f-k>gi!yDw01oaEPbtWEh%DxpF9R3)H|$6oj_DnKhN?lZ)oe~XL4fi`4#pD>|O5c z9qw?w3xd6~UD*G#ceBGa{CnBiyVy(U-Sp0Nwl2%~cvhjUm!HXzWHgQM>>Z4-=E%Q)k>yiWLt8ID(+hi_3ww_fYsYLIsl+-RdpDO! z@9bS%)kW{D+$^;9@-sQGbNt!+JIwFxVC%CiG_BXMcd~%q`S-D~bgFA;>*Z&9W9K)s zbKBXtz}D;7+5GHGes*6?32nXnOpmZ}$e-KH&g*68^s@7L*>yEFwDt1WRK1Gj5+zU_ zCGdzN3G{x(A6dxG{9$3Do$-GbvNI7(p`PRT1X!5OCGtl;urSficq0q(m=H|R6zbt_ zOn`;(ryh^2U?JR`%>f52g#QvM6a@Poe| ze&!TVQx{`-j3FjqEUzhq8+n1U5ZE)x z%NQ~_ve0}61(Q4Gjvp2>J+aXEuZ3?sCjt#-2LUAPoQMVx5kKXU0Qm7s0JY!@1B9ep zH&vmFkas+bz;q4+uDw>956q?N2fyL)5j#hq|7+3_z&!d5SLqM7yrVxm`thgDQeR?z{Aa*km-z5|Rz>DP zuHGQ`iDqAP^e4eJYP1<$ihEdE{wxC21MpvE>JsoR2e_^Mu=b?n$!^=yK2@h9uh-_P zGg79wAN^UUIdW~D$0fsZPs5oA_soQ`%5Ud)=gWY4c;rSt27Ap4Xs z_oK`Y{O4&NN0<*dl;JY*|9+-*34MCkeCRsa?9Yt*oF-r9u#V2%nIALwFTeTFhZ$@W zK|kobJg>X+4A4QP`>>npjQd*PJ$Z`z_OySiGjRRw+B|hes?Plw*l`Dh_&dD>{KMln z$4%?1@&UXFdid$u0&`uuyl8CYF93w4S34p&NDLch?p{avS+ePXfB0PpAv3w{&tmgWnK{;v_;RBxL7UzZvC zCG>j*Jw!lhamw~oKH%ph2e_~6?;3i1iu>2R+=2J2P-md69z)*8`^g&v|7N)h88Pwi z1N?XXV}{2ce=pEp$M%AH;OkNVUxuermymY=@0SX^XRot z_o1OZV;P9wX@%A$;JX3HJvDqQ-Y2CE6jf~cLDg(pmrz z^W7NeI{MIfx47IG&7GVDn!KEOn!HofHNX8mUwhTC%oFvH1$F8B1>Ie+Jv>oeGS!&| z=-0^eZt7={cjD7nF5a;$=)aga)@=*(U(AWt3O|BfE`U-eI8S1_>eU|z%t1~CV+>?;^v2Dv=XTXQ7=~n|?#~v8x zwl#l|w&2b}&E4#1O-{lX<%$ghU4wxChNv6hy*`%Vf73k$c zfJ-F!Hq-%>IbTBF0la@4&%3G4An(L4uH1D7ec*uiZOjKQdx0j0_`mre@AQK{Z@)~{ zCNiJ5bCIen;_p_6UMr;0$7$2R+EdN`U8XvNeqAsh=xU8$7x-{BV}4u@K<;R_f&N=C z?j2MSV3-!n1=tl*-e{J@oLOx7BRQKnr z3z`3vCBG@tHAbH);xF|}xZ646D^+5wL?4+`5pJo>KM3~fj}hM>i@sHiZ}0atCmb5D+*zjS;HbIH|h??==9m@ z%tKJ;W^{HO34Tg;fD&s;=%ccIsCJ^+KL^KklW)#|f6Dp*&*+o!$PfDBAn#^h9IUr| zozWPQg5Bbo4^Hd)azCN}4f@@*YasVS-y8I~nf;DprrGBPd4PEZj6=!L4~LfJYXklj zuFStAeU3*uzaI>KB}YS)sl>0utOxKVY0msf3YI{ffq4x2kvv!c?bhT+ax~a&Q+a(z z&}ZbtB)5aiXXMf>RVMKlu_!+#RN&na%dl;zcET^yJho=c@yI})F3(nFVHtv6m-Xr6 z>xj>MPT&vGJZ_L{$l+kOZwfxw>TztkHBWu}&^XoJj7ZI&dfpcX${wuTTvurq!154= z;P+q$eOyEEdw3h>CWo%hQKv!wSCkICpA2=|0rRg=7?a!qX1NK|5XRBJVf!#`h}pLT z=ZByN^yvuvr>rkr&---zG{Nl~=Ff3!zUDUbho3i&Hf9BlJlnQwx*E0p1<44BLijgWhER_Ro(Jkw z8s1XY5Beq?;~cOr$MJ~OpX3l_+)EyIJ>Wk{@EcAIL;Re&An&BkT*kRN&e@^9R7jn% zR1UPOj{8U(%<2-(^U$Uo?a4>B=EpeRmYmlA;~~n;Xh#ld)`EWKEwmvwKDQhDnMAN1 zhp|bA&rFu`t;pY@Z*@VtV6=(880B%%IL2uWNg-~@Xb+9H(8-h3Td@A49rWRG%57)| zjW*Cw-wyFM(8hk|GTJ|zY@aK<&R8ll@a}+R06mON3HR6pWk|!ibQ#8*Bjc6H;cwQS zpE6l>SijJt5a*IGH$DV1pPMq-?a;M3>Wg?SJ{v(hWdtm7}_6i#5x1^$JXXsk=KJg zsSDbaqCIWeY|sPn#@o^^f_XEup=9$&_%CC&`ZC(kn(SxMH}jc(fOiKh!{#B{F)33$ zHt}UZ8RNW{@sBk82E1p%{N@{w`&8gx1*r5oV@X(O&$(%cb~M_v@?!(kB{Tm>!yFiG zST_z-Anz|)O6OVr4z`HSXpe}tn9!y#@NELtaWY`;iguVL8_Z{3XDrDGcz3`uY#gK+ zb8L!g{n?rBXU;|_&K?PI-TKvl+Tp;z3gBev{;KjjJXqIR+{4=`@!p#;7@-Agm7^-glS;0#ldN#X^Q)3 z(8Q&Au`taTS0p|R;ks-)&I|9$<~XlN2;pw8NJzJc}_)9w(!z&$JxF-D>vJZFD(J{+0UR0vhQBn zEsy*U_twq(>QHWWM)4yrHvP!<&&_-1Mjle&?{e>RVp5nl?k%%&vpr=~HjfP08Mt^4 z+dF3a#$?a;&T?;@1*}Tnw??E^2WW*vi3FEJ|^44Wc!zF?~?6Xn)fV? zJn&~rvV2*{&QQetJ+`;U{(Dr2dwJ%4JkuWDqxSFES%>^HC+^w7eiz%Tqv^6U{Mgxj zu%`{Pn@4}xUYvO!&e9$n?!CcURk1xc$e-=C(bU-)a{RNUX>SVtFR^yT&W7XHx=i~} zY!Ax3{{&~hu`}P;S#LbAAb;F%vb5L4_Lq1bOlOu+9@u^o+e>2mNTux|v9rc-ykz@D zwA?}(*3bB}vltKTtSoj$7S>O;m%{c@9<_(U&b(rK4{YB-nBSw~Y;T0;!E{y=JEMu6 z&BV@R!gY9I{%r5#aq?#Turq^Ld&EAK?FZmB>`WlcpY8#$vwxl>Z!-_3b$zy`PuBA} zb|wwxPuB4H^JiGzY~7xv_c$T0YqK?Nww?{?@N3y@9iFXWo7b*I#iB(^5K5@;h5kqB9J9H$u!_>sOK;!QugKopxSSCwF?yO|nwU1`!8`>G z1_Q2B;If1_z`RZY%C+VL>j09+^`(MmX&L&|pf3$PXO(HkNBM&5<>*_1J{9Oofj$)Q zf4S1&?*$usw5>;*dbFiS8+x>NE-MXqK9HlWHQHFCZ8hTwY`}fccDl4Q@LsgJg?rP{ z#+KcSA==QQ-2mFmqOC0aRIDs$CxZLAcrV&o(tFXC675vbb`otS(N+>|B&lsA+Tfw> z9opO#yBBQg&@KvX=+Jf!ZRXHc4(DuW8^>(o&;|=_uS_;qd=h9|h4-Q@71~gt{S@v| zqpcL~6`^euvx!0*9JIYbn;W#XK^q(78EtCNmWJ_!HZy1|gElfk+ZeRHK${D+wLn>+ zZ3XTrqb&&DkG2!I|Bbd1mTV+ozuf`%+HsE^_tueL+)Kwjbkn^%E#1p_#JyJBW5vBy z+*8H9RNOmUnc^NB?yd2AY9K4zL$h}84EI)WPX+f Date: Thu, 18 Mar 2021 23:38:34 +0100 Subject: [PATCH 04/13] Delete temp --- static/temp | 1 - 1 file changed, 1 deletion(-) delete mode 100644 static/temp diff --git a/static/temp b/static/temp deleted file mode 100644 index 8b13789..0000000 --- a/static/temp +++ /dev/null @@ -1 +0,0 @@ - From 83c3a34b060b66e7d58325c6fb05a4fe0451c5ae Mon Sep 17 00:00:00 2001 From: Zakaria aourzag Date: Thu, 18 Mar 2021 23:13:22 +0000 Subject: [PATCH 05/13] Fully automate dev setup with Gitpod This commit implements a fully-automated development setup using Gitpod.io, an online IDE for GitLab, GitHub, and Bitbucket that enables Dev-Environments-As-Code. This makes it easy for anyone to get a ready-to-code workspace for any branch, issue or pull request almost instantly with a single click. --- .gitpod.Dockerfile | 13 +++++++++++++ .gitpod.yml | 5 +++++ 2 files changed, 18 insertions(+) create mode 100644 .gitpod.Dockerfile create mode 100644 .gitpod.yml diff --git a/.gitpod.Dockerfile b/.gitpod.Dockerfile new file mode 100644 index 0000000..e6abd29 --- /dev/null +++ b/.gitpod.Dockerfile @@ -0,0 +1,13 @@ +FROM gitpod/workspace-full + +# Install Redis. +RUN sudo apt-get update \ + && sudo apt-get install -y \ + redis-server mongodb \ + && sudo rm -rf /var/lib/apt/lists/* + +# Install custom tools, runtimes, etc. +# For example "bastet", a command-line tetris clone: +# RUN brew install bastet +# +# More information: https://www.gitpod.io/docs/config-docker/ diff --git a/.gitpod.yml b/.gitpod.yml new file mode 100644 index 0000000..44bd2e7 --- /dev/null +++ b/.gitpod.yml @@ -0,0 +1,5 @@ +image: + file: .gitpod.Dockerfile + +tasks: + - init: pip install -r ./requirements.txt From 9133a402c63a527d81e3aab60cf1f6f1caa3fcd2 Mon Sep 17 00:00:00 2001 From: Zakaria aourzag Date: Thu, 18 Mar 2021 23:18:30 +0000 Subject: [PATCH 06/13] updaye this --- requirements.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 63dc48b..8f02109 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,9 +1,11 @@ flask +flask-session +redis Pillow pycrypto asn1crypto==0.24.0 certifi==2018.4.16 -cffi==1.11.5 + chardet==3.0.4 ConfigArgParse==0.13.0 configobj==5.0.6 From 4c3c2547ae996a81ace80b9cab3f8ad9dcc55920 Mon Sep 17 00:00:00 2001 From: Zakaria aourzag Date: Thu, 18 Mar 2021 23:28:05 +0000 Subject: [PATCH 07/13] again? really? --- .gitpod.Dockerfile | 4 +++- requirements.txt | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitpod.Dockerfile b/.gitpod.Dockerfile index e6abd29..012d39c 100644 --- a/.gitpod.Dockerfile +++ b/.gitpod.Dockerfile @@ -5,7 +5,9 @@ RUN sudo apt-get update \ && sudo apt-get install -y \ redis-server mongodb \ && sudo rm -rf /var/lib/apt/lists/* - +ports: + - port: 80 + - port: 443 # Install custom tools, runtimes, etc. # For example "bastet", a command-line tetris clone: # RUN brew install bastet diff --git a/requirements.txt b/requirements.txt index 8f02109..c5216da 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,7 +5,7 @@ Pillow pycrypto asn1crypto==0.24.0 certifi==2018.4.16 - +dnspython chardet==3.0.4 ConfigArgParse==0.13.0 configobj==5.0.6 From 4b24febd60478070a7786986f6f443354ff92067 Mon Sep 17 00:00:00 2001 From: Zakaria aourzag Date: Fri, 19 Mar 2021 00:34:07 +0100 Subject: [PATCH 08/13] Update .gitpod.Dockerfile --- .gitpod.Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitpod.Dockerfile b/.gitpod.Dockerfile index 012d39c..ced6496 100644 --- a/.gitpod.Dockerfile +++ b/.gitpod.Dockerfile @@ -8,6 +8,8 @@ RUN sudo apt-get update \ ports: - port: 80 - port: 443 + + # Install custom tools, runtimes, etc. # For example "bastet", a command-line tetris clone: # RUN brew install bastet From 95079a7de765facf049ccd5d92e6a42cd6c1bc51 Mon Sep 17 00:00:00 2001 From: Zakaria aourzag Date: Fri, 19 Mar 2021 00:35:30 +0100 Subject: [PATCH 09/13] Update .gitpod.Dockerfile --- .gitpod.Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitpod.Dockerfile b/.gitpod.Dockerfile index ced6496..0a73ce0 100644 --- a/.gitpod.Dockerfile +++ b/.gitpod.Dockerfile @@ -5,9 +5,9 @@ RUN sudo apt-get update \ && sudo apt-get install -y \ redis-server mongodb \ && sudo rm -rf /var/lib/apt/lists/* -ports: - - port: 80 - - port: 443 + ports: + - 443:443 + - 80:80 # Install custom tools, runtimes, etc. From f98a896bbcf715a1fb7e85e6771fabe18f92e074 Mon Sep 17 00:00:00 2001 From: Zakaria aourzag Date: Fri, 19 Mar 2021 00:37:59 +0100 Subject: [PATCH 10/13] Update .gitpod.Dockerfile --- .gitpod.Dockerfile | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.gitpod.Dockerfile b/.gitpod.Dockerfile index 0a73ce0..5a44b5c 100644 --- a/.gitpod.Dockerfile +++ b/.gitpod.Dockerfile @@ -5,11 +5,8 @@ RUN sudo apt-get update \ && sudo apt-get install -y \ redis-server mongodb \ && sudo rm -rf /var/lib/apt/lists/* - ports: - - 443:443 - - 80:80 - - + EXPOSE 80 + EXPOSE 443 # Install custom tools, runtimes, etc. # For example "bastet", a command-line tetris clone: # RUN brew install bastet From 18494a30c760b2e2a135d624798da1aea8850306 Mon Sep 17 00:00:00 2001 From: Zakaria aourzag Date: Sat, 20 Mar 2021 20:50:01 +0100 Subject: [PATCH 11/13] fixing get authorization key so that it actullly works now the add-user endpoint didnt work and it had a different get methodd then other so i tested it with the other and it works; pushing to repo now --- server.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server.py b/server.py index 85a1ec6..89fabe1 100644 --- a/server.py +++ b/server.py @@ -245,7 +245,7 @@ def upload(): @app.route('/add-user', methods=['POST']) def add_user(): - token = request.headers.get("Authorization", "unknown") + token = request.form['Authorization'] if token != secret_key: return "Not authorized", 403 if request.method == 'POST': From dd149c1ecb30807023c2962adfecf9431635d049 Mon Sep 17 00:00:00 2001 From: root Date: Sun, 21 Mar 2021 01:09:58 +0100 Subject: [PATCH 12/13] make a dutch lang implements it just so it works :) --- templates/nl/home.html | 64 +++++++++ templates/nl/login.html | 53 ++++++++ templates/nl/my_config.html | 96 ++++++++++++++ templates/nl/my_files.html | 257 ++++++++++++++++++++++++++++++++++++ templates/nl/my_portal.html | 61 +++++++++ 5 files changed, 531 insertions(+) create mode 100644 templates/nl/home.html create mode 100644 templates/nl/login.html create mode 100644 templates/nl/my_config.html create mode 100644 templates/nl/my_files.html create mode 100644 templates/nl/my_portal.html diff --git a/templates/nl/home.html b/templates/nl/home.html new file mode 100644 index 0000000..84ac8be --- /dev/null +++ b/templates/nl/home.html @@ -0,0 +1,64 @@ + + + + + + ksoft.si :: Foto host + + + + + + + +
+

ksoft.si - Image host

+

Je persoonlijke geen bullshit foto host.

+
+ Mijn account + geef mijn config +
+
+

List van domeinen:

+

+ {% for d in domains %} + {{ d }}
+ {% endfor %} +

+
+ Don't email us about account creation.| . + +

+ english? + +
+ + +
+ + diff --git a/templates/nl/login.html b/templates/nl/login.html new file mode 100644 index 0000000..2c0c9be --- /dev/null +++ b/templates/nl/login.html @@ -0,0 +1,53 @@ + + + + + + Ksoft.Si :: Login + + + + + + +
+

Login

+ {% if is_error %} +

Wrong username or password.

+ {% endif %} +
+
+ + + +
+
+ Don't email us about account creation. | support@ksoft.si. + + +
+ + diff --git a/templates/nl/my_config.html b/templates/nl/my_config.html new file mode 100644 index 0000000..391b76f --- /dev/null +++ b/templates/nl/my_config.html @@ -0,0 +1,96 @@ + + + + + + Ksoft.Si :: Sharex Config + + + + + + +
+

Jouw config:

+ + +
+
+ Back +
+
+ +
+
+ 
{
+  "Name": "ksoft-sharex",
+  "DestinationType": "ImageUploader",
+  "RequestURL": "https://i.ksoft.si/upload",
+  "FileFormName": "image",
+  "Headers": {
+    "Authorization": "{{ token }}"
+  },
+  "URL": "https://i.ksoft.si/i/$json:filename$$json:extension$"
+}
+
+ + + + + diff --git a/templates/nl/my_files.html b/templates/nl/my_files.html new file mode 100644 index 0000000..b3d5b8f --- /dev/null +++ b/templates/nl/my_files.html @@ -0,0 +1,257 @@ + + + + + + Ksoft.Si :: Mijn bestanden + + + + + + + + + +
+

Your files:

+
+
+ terug naar je account +
+
+ + + +
+
+
+
+
+
+ vorige pagina +
+
+
{{ page }}
+
+
+ next page +
+
+
+ + + + + + + + + + {% for i in images %} + + + + + + {% else %} + + + + {% endfor %} + +
naamgecreeerdActies
+ {{ i.name }}{{ i.extension }}{{ i.created | getdate }} +
+ + + +
+
je hebt nog geen bestanden :(.
+
+ + + + + + diff --git a/templates/nl/my_portal.html b/templates/nl/my_portal.html new file mode 100644 index 0000000..ac3195f --- /dev/null +++ b/templates/nl/my_portal.html @@ -0,0 +1,61 @@ + + + + + + Ksoft.Si :: mijn account + + + + + + + +
+

Mijn Account

+

Je persoonlijke geen bullshit foto host.

+
+ Mijn config + Mijn bestanden +
+
+

Activiteit:

+

Totaal aantal bestanden: {{ total }}

+ + {% for f in images %} + + {% else %} + + {% endfor %} +
{{ f.name }}{{ f.extension }}→
geen recente activiteit.
+
+ Ksoft.Si team © 2021 | Discord: NANI#0001 + +
+ + From bf3ca6cdbbf2f3bf14373d2e43ce76fd27f27627 Mon Sep 17 00:00:00 2001 From: root Date: Sun, 21 Mar 2021 01:12:25 +0100 Subject: [PATCH 13/13] also for durch lang --- server.py | 99 +++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 92 insertions(+), 7 deletions(-) diff --git a/server.py b/server.py index 89fabe1..9dc4143 100644 --- a/server.py +++ b/server.py @@ -1,10 +1,5 @@ -import datetime -import hashlib -import os -import secrets -import traceback -from os.path import splitext -from werkzeug.utils import secure_filename +import datetime import hashlib import os import secrets import traceback from os.path import splitext from +werkzeug.utils import secure_filename import pymongo from PIL import Image @@ -204,6 +199,96 @@ def print_stats(): "files": _db.images.count(), "domains": len(allowed_domains) }) +@app.route('/nl/') +def index-nl(): + return render_template("home.html", domains=allowed_domains) + + +@app.route('/nl/login', methods=['GET', 'POST']) +def login-nl(): + if request.method == "POST": + usr = check_user(request.form.get("username", "unknown"), request.form.get("password", "unknown")) + if usr is None: + return render_template('login.html', is_error=True) + next_url = request.args.get("next", "/") + if session.get("logged_in"): + return redirect(next_url) + session['logged_in'] = usr.uid + return redirect(next_url) + + else: + return render_template('nl/login.html', is_error=False) + + +@app.route('/nl/my/ip', methods=['GET']) +def my_ip-nl(): + return jsonify({"ip": get_client_ip()}) + + +@app.route('/nl/my', methods=['GET']) +def my_portal-nl(): + if session.get("logged_in", None) is None: + return redirect("/login?next=/nl/my") + total = _db.images.find({"user_uid": session.get("logged_in")}).count() + activity = _db.images.find({"user_uid": session.get("logged_in")}).sort('created', pymongo.DESCENDING).limit(5) + activity = [x for x in activity] + return render_template("nl/my_portal.html", domains=allowed_domains, total=total, images=activity) + + +@app.route('/nl/my/files', methods=['GET', 'POST']) +def my_files-nl(): + if session.get("logged_in", None) is None: + return redirect("/nl/login?next=/nl/my/files") + + if request.method == "POST": + action = request.form.get("action") + if action == "delete_all": + total = _db.images.find({"user_uid": session.get("logged_in")}) + for image in total: + fpath = "{}/{}{}".format(storage_folder, image['name'], image['extension']) + if os.path.exists(fpath): + os.remove(fpath) + else: + print("This file does not exist:", fpath) + _db.images.delete_many({"user_uid": session.get("logged_in")}) + elif action == "delete_one": + name = request.form.get("name") + image = _db.images.find_one({"user_uid": session.get("logged_in"), "name": name}) + if image: + fpath = "{}/{}{}".format(storage_folder, image['name'], image['extension']) + if os.path.exists(fpath): + os.remove(fpath) + else: + print("This file does not exist:", fpath) + return jsonify({"success": False}) + _db.images.delete_one({"user_uid": session.get("logged_in"), "name": image['name']}) + return jsonify({"success": True}) + + def get_page(page_size, page_num): + skips = page_size * (page_num - 1) + cursor = _db.images.find({"user_uid": session.get("logged_in")}) \ + .skip(skips) \ + .limit(page_size) \ + .sort('created', pymongo.DESCENDING) + return [x for x in cursor] + + page = int(request.args.get("page", 1)) + images = get_page(50, page) + next_page = bool(get_page(50, page + 1)) + next_page_num = page + 1 + prev_page = page != 1 + prev_page_num = page - 1 + + return render_template("nl/my_files.html", images=images, page=page, next_page=next_page, prev_page=prev_page, + next_page_num=next_page_num, prev_page_num=prev_page_num) + + +@app.route('/nl/my/config', methods=['GET']) +def my_config-nl(): + if session.get("logged_in", None) is None: + return redirect("/nl/login?next=/nl/my/config") + usr = _db.users.find_one({"uid": session.get("logged_in")}) + return render_template("nl/my_config.html", **{"domains": allowed_domains, "token": usr['token']}) @app.route('/upload', methods=['POST'])