From a53f2aa274313bef1bed6db14941ad01c19d98a8 Mon Sep 17 00:00:00 2001
From: Aitzol <aitzol@lainoa.eus>
Date: Fri, 24 Nov 2023 20:25:35 +0100
Subject: [PATCH] 2fa-1.3

---
 _2fa.tpl                       |  10 ++------
 app.py                         |   4 +---
 locales/en/LC_MESSAGES/base.mo | Bin 4613 -> 5439 bytes
 locales/en/LC_MESSAGES/base.po |  24 +++++++++++++++++++
 locales/eu/LC_MESSAGES/base.mo | Bin 4702 -> 5572 bytes
 locales/eu/LC_MESSAGES/base.po |  41 +++++++++++++++++++++++++--------
 6 files changed, 58 insertions(+), 21 deletions(-)

diff --git a/_2fa.tpl b/_2fa.tpl
index 383971f..742f071 100644
--- a/_2fa.tpl
+++ b/_2fa.tpl
@@ -16,10 +16,7 @@
       <h1>{{ str['2fa-title'] }}</h1>
 
         % if data['secureAuth'] == True:
-        <div class="info">
-        Aurrerantzean ondorengo kodea erabili beharko duzu saioa hasteko. Mugikorrerako OTP edo 2FA aplikazioa baten
-        bidez QR kodea irakurtzean jasoko duzun gakoa baliatuz horretarako. 
-        </div>
+        <div class="info">{{ str['2fa-info-1'] }}</div>
 
             <div class="qr-code">
                 <img src="{{'static/tmp/'+data['authToken']+'.png'}}" /> 
@@ -37,10 +34,7 @@
             </form>
             
         % else:
-        <div class="info">
-        Bi urratseko autentifikazioa segurtasun gehigarri bat da. Hau gaituz saio hasieran erabiltzaile eta pasahitzaz
-        gain QR bidez jasoko duzun gako bat eskatuko zaizu. 
-        </div>
+        <div class="info">{{ str['2fa-info-2'] }}</div>
             <form name="enable2faForm" method="post" action="/enable_2fa">
 
                 <!--<input id="token" name="token" type="text" value="{{data['authToken']}}" readonly>-->
diff --git a/app.py b/app.py
index 98d8c3f..675464e 100644
--- a/app.py
+++ b/app.py
@@ -822,7 +822,6 @@ def add_auth_attribute_step3(conf, username, code, action):
     #set current LDAP
     superUser = SuperUsers(conf)
 
-    print(action)
     with connect_ldap(conf, user=superUser.admin_dn, password=superUser.admin_pwd) as c:
         user_dn = find_user_dn(conf, c, username)
         if(action == 'enable'):
@@ -1080,7 +1079,7 @@ def is_trusted_device(conf, user_dn):
             c.unbind()
             return True
         except Exception as e:
-            print(e)
+            LOG.warning(e)
             return True
 
 def update_login_info(conf, user_dn):
@@ -1127,7 +1126,6 @@ def newSession():
                 return CONF['locale']['lang']
 
         def get(self):
-            print(self.data)
             if 'username' in self.data:
                 return(self.data)
             else:
diff --git a/locales/en/LC_MESSAGES/base.mo b/locales/en/LC_MESSAGES/base.mo
index e5a39ae09b63d1c2f998cfb809fa0bbdd2c1ef51..a013ee656c1a928accb831917e745408703c6306 100644
GIT binary patch
literal 5439
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
H_zUD;L{a$W

delta 1331
zcmZA1Pe_w-9LMo*+tk{e%URi9|D?5Lx~;XPU4oz>tO&bBh1Jlgs2y^r$aNVQ9R@vF
zL=+vu3QVX$cuI(Nj7SJcq%b<zrA|TMrT1rBQvG<o&+BoI{+{ojXHIqG+Owa6o>61%
zCN>gZmzf>GaW^N{g2!wVenSqcsWMxIwYU;nF^X}l#xvM}=dcE^VgPd(#8Kq1C!E^M
zvNplRYCf38gSdbzFu`si+=F2pL?7nSi}#RUwK3$daZXCGfVDV@O00-o_!A@8Mpn9i
z6ums(`b!sP=W#hVGPoXxu@UcL44>nE{DK@7=9gs*sl<9vT|9wlyp3zInrgI9GlsAm
z$;JB7!}D#B3$^qD@;7!3JMlVh#+RrEeZ*}zk3Hz44XSWo#UWIsk5HYMt~i59#yW=@
zWsvf9KZaR7ILU=(*^AonI4Z*%s9D}bB`}5ooIuU;6>0?UQ5~2;jdBq+%6fl!lqXS@
zpT#idQKOvn(|?k(H+-Ot-k~1+0hQq#vX{-H68nx_*i=`Z<ssDlE2w=&Dmti6K0uA~
zF=_;_QKOtijnWsO|EjEyvg9#TC8trd%wZa*P_vBECT(;8RnaL_!Xv1J^QeyALM8AN
zJMjf-l%G-0an+Yc>CJMXStc-w7c1UJRr(gS@nS{wol)8@;_s#I(Hv_b))4Ik&$4yI
zpQQvewjG3u(bD^8I|*gGl}Hk*Ty6V*sj?=5?kz1PzkyI!)DarBwDhv6n<^|ps8cFN
zi+c19WJ^_+KH=0#G!t%O3!&M@2(9iir8!5q);B?|)eEJUPOF2^KQX<uE<&x=+D`DL
zvABNNn@XiKmxfv{XHuyFXSgcw+^HKVxC4jXPGiHfLeUp;x#N+9^TYq}pF2*`_v<$e
CPjKV_

diff --git a/locales/en/LC_MESSAGES/base.po b/locales/en/LC_MESSAGES/base.po
index 7243488..82ef3c4 100644
--- a/locales/en/LC_MESSAGES/base.po
+++ b/locales/en/LC_MESSAGES/base.po
@@ -129,6 +129,30 @@ msgstr "Devices"
 msgid "show"
 msgstr "show"
 
+#: libs/localization.py:43
+msgid "Two factor authentication"
+msgstr "Two factor authentication"
+
+#: libs/localization.py:44
+msgid "Token"
+msgstr "Token"
+
+#: libs/localization.py:45
+msgid "Disable"
+msgstr "Disable"
+
+#: libs/localization.py:46
+msgid "Enable"
+msgstr "Enable"
+
+#: libs/localization.py:47
+msgid "You must then use the following code to log in. Using the key you will receive by reading the QR code via a OTP or 2FA mobile app."
+msgstr "You must then use the following code to log in. Using the key you will receive by reading the QR code via a OTP or 2FA mobile app."
+
+#: libs/localization.py:48
+msgid "Two factor authentication is additional security. By enabling this you will be asked at the login, in addition to the user and password, a key you will receive by QR."
+msgstr "Two factor authentication is additional security. By enabling this you will be asked at the login, in addition to the user and password, a key you will receive by QR."
+
 #: libs/localization.py:45
 msgid "The session was closed."
 msgstr "The session was closed."
diff --git a/locales/eu/LC_MESSAGES/base.mo b/locales/eu/LC_MESSAGES/base.mo
index 0c4c6fd8569e98bb09695c83dd6e3361692b4fb7..a63c6887b790e0137eb5c127ad36cfcef1618520 100644
GIT binary patch
delta 2208
zcmajfTZq(E9Ki9j?r!Vmy575APUWp!$K6r$mYTL+D8dW+AW3j$=IqRA#{ZfA7uT7W
zp(sQsA|}O$B9IE|L7^onp^OqD0;4PRV)Z171!V+11bu)1`ELbL9p?N$=YKorcYf#m
z=feDROIjCZ_Z(G}jnrGHbEhb^4+nZUQ0l!(-HMN+TzU@Y;tMzvU&m#52Cu=(I0t{i
zKJ4Y9I2~u;Je-XSkVjf-HI2KtumR^`0r{yz93H|J_TwkG2*1L`_&ZL+h4g+c=8+E7
zdgPXR043lDaR7Iq1iBxW;xm|Ie03&!;1Wtlzh-t#Rf?Y);BXVp!|QPvhjBY@!3Oe*
zI-B_s%7i|}HFy<0E@c)s;7cg|oW@?pSLbQmh+pDs_#-aDqeLS!c^73S=TK7rG18~H
zfJ1l@@5H&JLjqZaPvS<r8$ZC+cm*W`3rL5!7h95wr)kIl6Pa)0$}R>*iS+99P9W0;
zJ8L@|WepeN?YIVI;C;wXne4od66hhk4xd0-;^Qb2J2^=HWz)UI1<AnYC~J5Hx8cv(
z`Pvzs8Qh=QK-qk6q6G3Gk_7d2=J!bK>I(8xzi}ABeqLIR>u>}5ndDzOI>~{t)LE4C
z^Bh<O^)1Tozl5@OeY2EWiyCEZA3+)DC`txS;9`6OWuPyxf_+3O8K|R-a~Nf!$67Qb
z125tUd<XBr{d_|bz+oi&>Uq@oa(4bcN+9Pkhy82}mRGIDQ#gvZ;V-xd=a6^VBkNH5
ze-wwXb%cgQei|jB_mHJeqm{LlA}`47C2}dUSENX$h*#yQk|o(}lSR@idq;v?LY1sY
zrq)r3IW5cO`<KF)Y86!?l21owEJZT&_p*@_33h}!OudgPrJFj1%4E|lfV!EgrI8ic
zaFc~qQTL`NjK7S={K-2gJ9Y(iVRmf+O6t~U=dw{HQ}Rj4|AG`rwR}mFMV3T1<Vvb+
zKv_yz1}U;{?vTc&V$rvM=sDgu>LOF9+4fVtV?ENCxY)b1yS2wxZJ_pydp%}~u@ALL
z;))GoS2VHn|8YmVNSjj0$y27LBU?;D7dLWxb3@yJ0bEelafPQEKGEZ@R?`KmO;oid
zZDQ_NUGwFwE*R1-__HS+`}9^4Swaa)x^ALq+=rzhZFJQ({^~5WMe7b)U1;cCyW1=K
zPqp-cBuYCDG_R-KjQLv4k4q#)U*eLNF&QtX_eP!g?7#LJT2q>QX4mdc2M3)Yjvae;
zYBH7Ix=A1K1y^HQ^?GjNyZ+Ix!I6=r`4u`pyf#0wWO$^VpY~1n@?5?>IB;a@sEx|T
z#Yy|vK&^M1v?jWyzuMi}W~$z(%}ys_XyV9Ly)1&P!I-O>ru(0pq`sVlv5AsEmu<zB
zO&B^|Ajc(>)7wp=(@~o`GS2IYiJT2hpg9nF+%#Kc0yZ|1YEyAsY04V`Y1IW+vQ7P%
zi9A7-lBNtnv}x})s+u_Aq-k6;X}>b_a%&Sakj~?#Wdt9Td}xER*Hw~lvJnZ*R!o@n
zmj-1ds+f7_^utNnRejnEPe`I|$)}k%^;#zzGPn)0(1@|qxeHBom^7p#|07_-OEpKh
SO<j@RW5eS<*M4@^XMX@^wu*@W

delta 1350
zcmZA1Pe@cz6vy$SqhpTFSpG@vpJQ5@e`m(AF&9#h1W6>daUlo|N+skXg*G`Fv~ZJ)
zhe@<GX`w<5M6_rTx@u7w5>g2LA;y&y1qCho{+_RhF7M3ey*GC6x#yl~xpAX5wNaci
zV~k_OKH^iB*;!oh@xjRCnC-_+<g&b6vr;U?omh>n7(+i^z!JQKd3YU*@Fo`H4073h
zK5EQTw!}>tFIKS!GnkKYW~;+4tj8fNz-bKNUF1(~9=U9R4<(q!LVS!$Yz3R~JGNjA
zS?T+87+`%HaBs{m;|{(U!#y~T<#-1p_yD`{19DkCe=H-&POJk}#eN*Y+gO2qcB6T!
zunrSQE;fKUtZzfysHDTlzp)8y!YMq6k5CJ(;}Lw19aumaw8N90qo|$Ep(?TJ`3BoL
z)_15xirKyrXuy=tD$0${rW>oU54GSm4B>?LJdL|~o<$wm5^ADlRPQ{;O3dIX%noiJ
z(P>n|y`EF3-gy?J{#y7oFG$WldwxOYuwSU=$tQ~_R$?3WU>BxP6Fo&Pd*MBAAVsn*
zRP+8s9Yr~lbz%f{RKrEoUklyig?9W9>+uO{p^tbG%UMM`pFrlaS!}?0)IzV2T<tA}
zanpMa?Al(i0$X^09@WG*@BrRQaZ|_5BI>NyP!s>aCaj@6N~{;v?S05m+EL=)q3@JH
zm{6j%1Ub0J0q)TJs&<r6H8j+J?oQQshlzGVrO_|o|Dh&T)~djtp>y3!sIjyW3ifxX
z^!jDA5^+MkqQ=x<f2u^v?O68>AJv2!Q2+NFB6KtnLL;$_+b1feehI3Oj!Vs`p~|Td
z)zsO9DyPv%=$K-9IFU?_j9nQGUmZ&(2c7ZUX{XFTn4a{X@i{Yr#q>(S@vKlJ-W*AU
nqivnBL}Mi8lmyp(v6i^A6`XP=L&NE>p*f$^Uy^aYmA?E95{7u*

diff --git a/locales/eu/LC_MESSAGES/base.po b/locales/eu/LC_MESSAGES/base.po
index 9b4dac2..3a70da0 100644
--- a/locales/eu/LC_MESSAGES/base.po
+++ b/locales/eu/LC_MESSAGES/base.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2022-04-07 17:23+0200\n"
-"PO-Revision-Date: 2023-04-07 13:27+0200\n"
+"PO-Revision-Date: 2023-11-24 20:21+0100\n"
 "Last-Translator: Aitzol Berasategi <aitzol@lainoa.eus>\n"
 "Language-Team: LANGUAGE <EU@eu.org>\n"
 "Language: eu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 2.3\n"
+"X-Generator: Poedit 3.2.2\n"
 
 #: libs/localization.py:15
 msgid "User"
@@ -129,6 +129,32 @@ msgstr "Gailuak"
 msgid "show"
 msgstr "ikusi"
 
+#: libs/localization.py:43
+msgid "Two factor authentication"
+msgstr "Bi urratseko autentifikazioa"
+
+#: libs/localization.py:44
+msgid "Token"
+msgstr "Gakoa"
+
+#: libs/localization.py:45
+msgid "Disable"
+msgstr "Desgaitu"
+
+#: libs/localization.py:46
+msgid "Enable"
+msgstr "Gaitu"
+
+#: libs/localization.py:47
+msgid "You must then use the following code to log in. Using the key you will receive by reading the QR code via a OTP or 2FA mobile app."
+msgstr ""
+"Aurrerantzean ondorengo kodea erabili beharko duzu saioa hasteko. Mugikorrerako OTP edo 2FA aplikazio baten bidez QR kodea irakurtzean jasoko duzun gakoa baliatuz "
+"horretarako."
+
+#: libs/localization.py:48
+msgid "Two factor authentication is additional security. By enabling this you will be asked at the login, in addition to the user and password, a key you will receive by QR."
+msgstr "Bi urratseko autentifikazioa segurtasun gehigarri bat da. Hau gaituz saio hasieran erabiltzaile eta pasahitzaz gain QR bidez jasoko duzun gako bat eskatuko zaizu."
+
 #: libs/localization.py:45
 msgid "The session was closed."
 msgstr "Saioa itxi da."
@@ -158,12 +184,8 @@ msgid "Passwords do not match!"
 msgstr "Pasahitzak ez datoz bat!"
 
 #: libs/localization.py:53
-msgid ""
-"The password must contain at least 8 characters, at least one number, "
-"a capital letter and a special character."
-msgstr ""
-"Pasahitzak gutxienez 8 karaktere izan behar ditu, zenbaki bat, hizki larri bat "
-"eta karaktere berezi bat."
+msgid "The password must contain at least 8 characters, at least one number, a capital letter and a special character."
+msgstr "Pasahitzak gutxienez 8 karaktere izan behar ditu, zenbaki bat, hizki larri bat eta karaktere berezi bat."
 
 #: libs/localization.py:54
 msgid "Congratulations, your account has been created!"
@@ -222,8 +244,7 @@ msgid "Unable to connect to the remote server."
 msgstr "Ezinezkoa urruneko zerbitzara konektatzea."
 
 #: libs/localization.py:68
-msgid ""
-"Encountered an unexpected error while communicating with the remote server."
+msgid "Encountered an unexpected error while communicating with the remote server."
 msgstr "Ezusteko errore bat gertatu da urruneko zerbitzariarekin komunikatzean."
 
 #: libs/localization.py:69