From ed4b74131966132983bfae01a741f06e464b3175 Mon Sep 17 00:00:00 2001
From: Christophe Maudoux <chrmdx@gmail.com>
Date: Mon, 30 Apr 2018 16:55:41 +0200
Subject: [PATCH 01/10] Fix display bug when deleting 2F device from manager

---
 lemonldap-ng-manager/site/templates/2ndfa.tpl | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lemonldap-ng-manager/site/templates/2ndfa.tpl b/lemonldap-ng-manager/site/templates/2ndfa.tpl
index e6a5b27e8..2487e6006 100644
--- a/lemonldap-ng-manager/site/templates/2ndfa.tpl
+++ b/lemonldap-ng-manager/site/templates/2ndfa.tpl
@@ -86,13 +86,13 @@
       </table>
     </div>
     <div ng-if="!node.nodes" >
-	   <th ng-if="node.title!='UBK' && node.title!='TOTP' && node.title!='U2F'">{{translate(node.title)}}</th>
-       <td ng-if="node.title=='TOTP' || node.title=='UBK' || node.title=='U2F'" >{{node.title}}</td>
+	   <th class="col-md-3" ng-if="node.title!='UBK' && node.title!='TOTP' && node.title!='U2F'">{{translate(node.title)}}</th>
+       <td class="data-{{node.epoch}}" ng-if="node.title=='TOTP' || node.title=='UBK' || node.title=='U2F'" >{{node.title}}</td>
 	   <th class="col-md-3" ng-if="node.title=='type'">{{translate(node.value)}}</th>
-	   <td class="col-md-3" ng-if="node.title!='type'" >{{node.value}}</td>
+	   <td class="col-md-3 data-{{node.epoch}}" ng-if="node.title!='type'" >{{node.value}}</td>
 	   <th class="col-md-3" ng-if="node.title=='type'">{{translate(node.epoch)}}</th>
-	   <td class="col-md-3" ng-if="node.title=='TOTP' || node.title=='UBK' || node.title=='U2F'">{{localeDate(node.epoch)}}</td>
-      <td >
+	   <td class="col-md-3 data-{{node.epoch}}" ng-if="node.title=='TOTP' || node.title=='UBK' || node.title=='U2F'">{{localeDate(node.epoch)}}</td>
+      <td class="data-{{node.epoch}}">
 		  <span ng-if="node.title=='TOTP' || node.title=='UBK' || node.title=='U2F'" class="link text-danger glyphicon glyphicon-minus-sign" ng-click="delete2FA(node.title, node.epoch)"></span>
 		  <!--
 		  <span ng-if="$last && ( node.title=='TOTP' || node.title=='UBK' || node.title=='U2F' )" class="link text-success glyphicon glyphicon-plus-sign" ng-click="menuClick({title:'newRule'})"></span>

From 813926e9d3a354212f908baa9305fdca2f58b80c Mon Sep 17 00:00:00 2001
From: Christophe Maudoux <chrmdx@gmail.com>
Date: Mon, 30 Apr 2018 16:56:47 +0200
Subject: [PATCH 02/10] Delete empty _2fDevices session key

---
 lemonldap-ng-manager/site/coffee/sessions.coffee           | 5 +++--
 lemonldap-ng-manager/site/htdocs/static/js/sessions.js     | 4 +++-
 lemonldap-ng-manager/site/htdocs/static/js/sessions.min.js | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/lemonldap-ng-manager/site/coffee/sessions.coffee b/lemonldap-ng-manager/site/coffee/sessions.coffee
index f2e878f0b..49fd2eda3 100644
--- a/lemonldap-ng-manager/site/coffee/sessions.coffee
+++ b/lemonldap-ng-manager/site/coffee/sessions.coffee
@@ -207,8 +207,7 @@ llapp.controller 'SessionsExplorerCtrl', ['$scope', '$translator', '$location',
 			# 2. Push session keys in result, grouped by categories
 			for category, attrs of categories
 				subres = []
-				for attr in attrs
-				
+				for attr in attrs		
 					if session[attr]  and session[attr].match(/\w+/)
 						if session[attr].match(/"type":\s*"(?:TOTP|U2F|UBK)"/)
 							subres.push
@@ -235,6 +234,8 @@ llapp.controller 'SessionsExplorerCtrl', ['$scope', '$translator', '$location',
 								value: session[attr]
 								epoch: ''
 							delete session[attr]
+					else
+						delete session[attr]
 				if subres.length >0
 					res.push
 						title: "__#{category}__"
diff --git a/lemonldap-ng-manager/site/htdocs/static/js/sessions.js b/lemonldap-ng-manager/site/htdocs/static/js/sessions.js
index acad4a0b5..2dfb65e34 100644
--- a/lemonldap-ng-manager/site/htdocs/static/js/sessions.js
+++ b/lemonldap-ng-manager/site/htdocs/static/js/sessions.js
@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.9.3
+// Generated by CoffeeScript 1.10.0
 
 /*
  * Session explorer
@@ -277,6 +277,8 @@
                   });
                   delete session[attr];
                 }
+              } else {
+                delete session[attr];
               }
             }
             if (subres.length > 0) {
diff --git a/lemonldap-ng-manager/site/htdocs/static/js/sessions.min.js b/lemonldap-ng-manager/site/htdocs/static/js/sessions.min.js
index b9a47b1cd..b52f276e0 100644
--- a/lemonldap-ng-manager/site/htdocs/static/js/sessions.min.js
+++ b/lemonldap-ng-manager/site/htdocs/static/js/sessions.min.js
@@ -1 +1 @@
-(function(){var c,e,d,b,g,f,a;b=25;a={_whatToTrace:[function(i,h){return"groupBy=substr("+i+",1)"},function(i,h){return i+"="+h+"*&groupBy="+i},function(i,h){return i+"="+h}],ipAddr:[function(i,h){return"groupBy=net("+i+",16,1)"},function(i,h){if(!h.match(/:/)){h=h+"."}return i+"="+h+"*&groupBy=net("+i+",32,2)"},function(i,h){if(!h.match(/:/)){h=h+"."}return i+"="+h+"*&groupBy=net("+i+",48,3)"},function(i,h){if(!h.match(/:/)){h=h+"."}return i+"="+h+"*&groupBy=net("+i+",128,4)"},function(i,h){return i+"="+h+"&groupBy=_whatToTrace"},function(i,h,j){return j.replace(/\&groupBy.*$/,"")+("&_whatToTrace="+h)}],_startTime:[function(i,h){return"groupBy=substr("+i+",8)"},function(i,h){return i+"="+h+"*&groupBy=substr("+i+",10)"},function(i,h){return i+"="+h+"*&groupBy=substr("+i+",11)"},function(i,h){return i+"="+h+"*&groupBy=substr("+i+",12)"},function(i,h){return i+"="+h+"*&groupBy=_whatToTrace"},function(i,h,j){console.log(i);console.log(h);console.log(j);return j.replace(/\&groupBy.*$/,"")+("&_whatToTrace="+h)}],doubleIp:[function(i,h){return i},function(i,h){return"_whatToTrace="+h+"&groupBy=ipAddr"},function(i,h,j){return j.replace(/\&groupBy.*$/,"")+("&ipAddr="+h)}]};f={_whatToTrace:function(i,h,k,j){if(k===1){return i+"="+h+"*&groupBy=substr("+i+","+(k+j+1)+")"}else{return null}},ipAddr:function(i,h,k,j){if(k>0&&k<4){return i+"="+h+"*&groupBy=net("+i+","+(16*k+4*(j+1))+",2)"}else{return null}}};e="_password";c={dateTitle:["_utime","_startTime","_updateTime","_lastAuthnUTime","_lastSeen"],connectionTitle:["ipAddr","_timezone","_url"],authenticationTitle:["_session_id","_user","_password","authenticationLevel"],modulesTitle:["_auth","_userDB","_passwordDB","_issuerDB","_authChoice","_authMulti","_userDBMulti"],saml:["_idp","_idpConfKey","_samlToken","_lassoSessionDump","_lassoIdentityDump"],groups:["groups","hGroups"],ldap:["dn"],BrowserID:["_browserIdAnswer","_browserIdAnswerRaw"],OpenIDConnect:["_oidc_id_token","_oidc_OP","_oidc_access_token"],sfaTitle:["_2fDevices"]};g={session:[{title:"deleteSession",icon:"trash"}],home:[]};d=angular.module("llngSessionsExplorer",["ui.tree","ui.bootstrap","llApp"]);d.controller("SessionsExplorerCtrl",["$scope","$translator","$location","$q","$http",function(p,h,i,j,m){var n,l,k,o;p.links=links;p.menulinks=menulinks;p.staticPrefix=staticPrefix;p.scriptname=scriptname;p.formPrefix=formPrefix;p.availableLanguages=availableLanguages;p.waiting=true;p.showM=false;p.showT=true;p.data=[];p.currentScope=null;p.currentSession=null;p.menu=g;p.translateP=h.translateP;p.translate=h.translate;p.translateTitle=function(q){return h.translateField(q,"title")};o="global";p.menuClick=function(q){if(q.popup){window.open(q.popup)}else{if(!q.action){q.action=q.title}switch(typeof q.action){case"function":q.action(p.currentNode,p);break;case"string":p[q.action]();break;default:console.log(typeof q.action)}}return p.showM=false};p.deleteSession=function(){p.waiting=true;return m["delete"](scriptname+"sessions/"+o+"/"+p.currentSession.id).then(function(q){p.currentSession=null;p.currentScope.remove();return p.waiting=false},function(q){p.currentSession=null;p.currentScope.remove();return p.waiting=false})};p.stoggle=function(q){var r;r=q.$modelValue;if(r.nodes.length===0){p.updateTree(r.value,r.nodes,r.level,r.over,r.query,r.count)}return q.toggle()};p.displaySession=function(r){var s,q;q=function(t){var B,E,y,z,J,G,L,S,O,F,N,M,X,K,P,A,x,w,I,W,Q,u,D,V,C,T,v,U,R,H;E=function(Y){return Y};B=function(ab,ad){var Z,aa,Y,ac;Y=[];aa=new RegExp(ab);for(Z in t){ac=t[Z];if(Z.match(aa)&&ac){Y.push({title:Z,value:ac});delete t[Z]}}if(Y.length>0){return V.push({title:ad,nodes:Y})}};v=t._utime;F=t._session_id;for(X in t){H=t[X];if(!H){delete t[X]}else{if(typeof t==="string"&&H.match(/; /)){t[X]=H.split("; ")}if(typeof t[X]!=="object"){if(e.match(new RegExp("\b"+X+"\b"))){t[X]="********"}else{if(X.match(/^(_utime|_lastAuthnUTime|_lastSeen|notification)$/)){t[X]=p.localeDate(H)}else{if(X.match(/^(_startTime|_updateTime)$/)){Q=/^(\d{4})(\d{2})(\d{2})(\d{2})(\d{2})(\d{2})$/;z=H.match(Q);t[X]=z[3]+"/"+z[2]+"/"+z[1]+" à "+z[4]+":"+z[5]+":"+z[6]}}}}}}V=[];for(L in c){G=c[L];T=[];for(O=0,P=G.length;O<P;O++){J=G[O];if(t[J]&&t[J].match(/\w+/)){if(t[J].match(/"type":\s*"(?:TOTP|U2F|UBK)"/)){T.push({title:"type",value:"name",epoch:"date"});y=JSON.parse(t[J]);for(N=0,A=y.length;N<A;N++){C=y[N];for(X in C){H=C[X];if(X==="type"){U=H}if(X==="name"){W=H}if(X==="epoch"){S=H}}T.push({title:U,value:W,epoch:S})}delete t[J]}else{T.push({title:J,value:t[J],epoch:""});delete t[J]}}}if(T.length>0){V.push({title:"__"+L+"__",nodes:T})}}B("^openid","OpenID");B("^notification_(.+)","__notificationsDone__");if(t._loginHistory){R=[];if(t._loginHistory.successLogin){u=t._loginHistory.successLogin;for(M=0,x=u.length;M<x;M++){K=u[M];R.push({t:K._utime,title:p.localeDate(K._utime),value:"Success (IP "+K.ipAddr+")"})}}if(t._loginHistory.failedLogin){D=t._loginHistory.failedLogin;for(I=0,w=D.length;I<w;I++){K=D[I];R.push({t:K._utime,title:p.localeDate(K._utime),value:K.error+" (IP "+K.ipAddr+")"})}}delete t._loginHistory;R.sort(function(Z,Y){return Z.t-Y.t});V.push({title:"__loginHistory__",nodes:R})}R=[];for(X in t){H=t[X];R.push({title:X,value:H})}R.sort(function(Z,Y){if(Z.title>Y.title){return 1}else{if(Z.title<Y.title){return -1}else{return 0}}});V.push({title:"__attributesAndMacros__",nodes:R});return{_utime:v,id:F,nodes:V}};p.currentScope=r;s=r.$modelValue.session;m.get(scriptname+"sessions/"+o+"/"+s).then(function(t){return p.currentSession=q(t.data)});return p.showT=false};p.localeDate=function(q){var r;r=new Date(q*1000);return r.toLocaleString()};p.getLanguage=function(q){p.lang=q;p.form="white";p.init();return p.showM=false};k=function(r,q,s){var t;t=q.match(/#\/(\w+)/);o="global";if(t===null){p.type="_whatToTrace"}else{if(t[1].match(/^(persistent)$/)){o=RegExp.$1;p.type="_session_uid"}else{p.type=t[1]}}return p.init()};p.$on("$locationChangeSuccess",k);n=0;p.updateTree=function(y,s,q,v,x,u){var w,r,t;p.waiting=true;r=a[p.type]?a[p.type]:p.type==="_updateTime"?a._startTime:a._whatToTrace;w=r[q](p.type,y,x);if(u>b&&f[p.type]){if(t=f[p.type](p.type,y,q,v,x)){v++;w=t;q=q-1}else{v=0}}else{v=0}return m.get(scriptname+"sessions/"+o+"?"+w).then(function(A){var D,B,z,E,C;D=A.data;if(D.result){C=D.values;for(B=0,z=C.length;B<z;B++){E=C[B];n++;E.id="node"+n;if(q<r.length-1){E.nodes=[];E.level=q+1;E.query=w;E.over=v;if(p.type.match(/^(?:start|update)Time$/)){E.title=E.value.replace(/^(\d{8})(\d{2})(\d{2})$/,"$2:$3").replace(/^(\d{8})(\d{2})(\d)$/,"$2:$30").replace(/^(\d{8})(\d{2})$/,"$2h").replace(/^(\d{4})(\d{2})(\d{2})/,"$1-$2-$3")}}s.push(E)}if(y===""){p.total=D.total}}return p.waiting=false},function(z){return p.waiting=false})};p.init=function(){p.waiting=true;p.data=[];j.all([h.init(p.lang),p.updateTree("",p.data,0,0)]).then(function(){return p.waiting=false},function(q){return p.waiting=false});p.activeModule="sessions";return p.myStyle={color:"#ffb84d"}};l=i.path().match(/^\/(\w+)/);return p.type=l?l[1]:"_whatToTrace"}])}).call(this);
\ No newline at end of file
+(function(){var c,e,d,b,g,f,a;b=25;a={_whatToTrace:[function(i,h){return"groupBy=substr("+i+",1)"},function(i,h){return i+"="+h+"*&groupBy="+i},function(i,h){return i+"="+h}],ipAddr:[function(i,h){return"groupBy=net("+i+",16,1)"},function(i,h){if(!h.match(/:/)){h=h+"."}return i+"="+h+"*&groupBy=net("+i+",32,2)"},function(i,h){if(!h.match(/:/)){h=h+"."}return i+"="+h+"*&groupBy=net("+i+",48,3)"},function(i,h){if(!h.match(/:/)){h=h+"."}return i+"="+h+"*&groupBy=net("+i+",128,4)"},function(i,h){return i+"="+h+"&groupBy=_whatToTrace"},function(i,h,j){return j.replace(/\&groupBy.*$/,"")+("&_whatToTrace="+h)}],_startTime:[function(i,h){return"groupBy=substr("+i+",8)"},function(i,h){return i+"="+h+"*&groupBy=substr("+i+",10)"},function(i,h){return i+"="+h+"*&groupBy=substr("+i+",11)"},function(i,h){return i+"="+h+"*&groupBy=substr("+i+",12)"},function(i,h){return i+"="+h+"*&groupBy=_whatToTrace"},function(i,h,j){console.log(i);console.log(h);console.log(j);return j.replace(/\&groupBy.*$/,"")+("&_whatToTrace="+h)}],doubleIp:[function(i,h){return i},function(i,h){return"_whatToTrace="+h+"&groupBy=ipAddr"},function(i,h,j){return j.replace(/\&groupBy.*$/,"")+("&ipAddr="+h)}]};f={_whatToTrace:function(i,h,k,j){if(k===1){return i+"="+h+"*&groupBy=substr("+i+","+(k+j+1)+")"}else{return null}},ipAddr:function(i,h,k,j){if(k>0&&k<4){return i+"="+h+"*&groupBy=net("+i+","+(16*k+4*(j+1))+",2)"}else{return null}}};e="_password";c={dateTitle:["_utime","_startTime","_updateTime","_lastAuthnUTime","_lastSeen"],connectionTitle:["ipAddr","_timezone","_url"],authenticationTitle:["_session_id","_user","_password","authenticationLevel"],modulesTitle:["_auth","_userDB","_passwordDB","_issuerDB","_authChoice","_authMulti","_userDBMulti"],saml:["_idp","_idpConfKey","_samlToken","_lassoSessionDump","_lassoIdentityDump"],groups:["groups","hGroups"],ldap:["dn"],BrowserID:["_browserIdAnswer","_browserIdAnswerRaw"],OpenIDConnect:["_oidc_id_token","_oidc_OP","_oidc_access_token"],sfaTitle:["_2fDevices"]};g={session:[{title:"deleteSession",icon:"trash"}],home:[]};d=angular.module("llngSessionsExplorer",["ui.tree","ui.bootstrap","llApp"]);d.controller("SessionsExplorerCtrl",["$scope","$translator","$location","$q","$http",function(p,h,i,j,m){var n,l,k,o;p.links=links;p.menulinks=menulinks;p.staticPrefix=staticPrefix;p.scriptname=scriptname;p.formPrefix=formPrefix;p.availableLanguages=availableLanguages;p.waiting=true;p.showM=false;p.showT=true;p.data=[];p.currentScope=null;p.currentSession=null;p.menu=g;p.translateP=h.translateP;p.translate=h.translate;p.translateTitle=function(q){return h.translateField(q,"title")};o="global";p.menuClick=function(q){if(q.popup){window.open(q.popup)}else{if(!q.action){q.action=q.title}switch(typeof q.action){case"function":q.action(p.currentNode,p);break;case"string":p[q.action]();break;default:console.log(typeof q.action)}}return p.showM=false};p.deleteSession=function(){p.waiting=true;return m["delete"](scriptname+"sessions/"+o+"/"+p.currentSession.id).then(function(q){p.currentSession=null;p.currentScope.remove();return p.waiting=false},function(q){p.currentSession=null;p.currentScope.remove();return p.waiting=false})};p.stoggle=function(q){var r;r=q.$modelValue;if(r.nodes.length===0){p.updateTree(r.value,r.nodes,r.level,r.over,r.query,r.count)}return q.toggle()};p.displaySession=function(r){var s,q;q=function(t){var B,E,y,z,J,G,L,S,O,F,N,M,X,K,P,A,x,w,I,W,Q,u,D,V,C,T,v,U,R,H;E=function(Y){return Y};B=function(ab,ad){var Z,aa,Y,ac;Y=[];aa=new RegExp(ab);for(Z in t){ac=t[Z];if(Z.match(aa)&&ac){Y.push({title:Z,value:ac});delete t[Z]}}if(Y.length>0){return V.push({title:ad,nodes:Y})}};v=t._utime;F=t._session_id;for(X in t){H=t[X];if(!H){delete t[X]}else{if(typeof t==="string"&&H.match(/; /)){t[X]=H.split("; ")}if(typeof t[X]!=="object"){if(e.match(new RegExp("\b"+X+"\b"))){t[X]="********"}else{if(X.match(/^(_utime|_lastAuthnUTime|_lastSeen|notification)$/)){t[X]=p.localeDate(H)}else{if(X.match(/^(_startTime|_updateTime)$/)){Q=/^(\d{4})(\d{2})(\d{2})(\d{2})(\d{2})(\d{2})$/;z=H.match(Q);t[X]=z[3]+"/"+z[2]+"/"+z[1]+" à "+z[4]+":"+z[5]+":"+z[6]}}}}}}V=[];for(L in c){G=c[L];T=[];for(O=0,P=G.length;O<P;O++){J=G[O];if(t[J]&&t[J].match(/\w+/)){if(t[J].match(/"type":\s*"(?:TOTP|U2F|UBK)"/)){T.push({title:"type",value:"name",epoch:"date"});y=JSON.parse(t[J]);for(N=0,A=y.length;N<A;N++){C=y[N];for(X in C){H=C[X];if(X==="type"){U=H}if(X==="name"){W=H}if(X==="epoch"){S=H}}T.push({title:U,value:W,epoch:S})}delete t[J]}else{T.push({title:J,value:t[J],epoch:""});delete t[J]}}else{delete t[J]}}if(T.length>0){V.push({title:"__"+L+"__",nodes:T})}}B("^openid","OpenID");B("^notification_(.+)","__notificationsDone__");if(t._loginHistory){R=[];if(t._loginHistory.successLogin){u=t._loginHistory.successLogin;for(M=0,x=u.length;M<x;M++){K=u[M];R.push({t:K._utime,title:p.localeDate(K._utime),value:"Success (IP "+K.ipAddr+")"})}}if(t._loginHistory.failedLogin){D=t._loginHistory.failedLogin;for(I=0,w=D.length;I<w;I++){K=D[I];R.push({t:K._utime,title:p.localeDate(K._utime),value:K.error+" (IP "+K.ipAddr+")"})}}delete t._loginHistory;R.sort(function(Z,Y){return Z.t-Y.t});V.push({title:"__loginHistory__",nodes:R})}R=[];for(X in t){H=t[X];R.push({title:X,value:H})}R.sort(function(Z,Y){if(Z.title>Y.title){return 1}else{if(Z.title<Y.title){return -1}else{return 0}}});V.push({title:"__attributesAndMacros__",nodes:R});return{_utime:v,id:F,nodes:V}};p.currentScope=r;s=r.$modelValue.session;m.get(scriptname+"sessions/"+o+"/"+s).then(function(t){return p.currentSession=q(t.data)});return p.showT=false};p.localeDate=function(q){var r;r=new Date(q*1000);return r.toLocaleString()};p.getLanguage=function(q){p.lang=q;p.form="white";p.init();return p.showM=false};k=function(r,q,s){var t;t=q.match(/#\/(\w+)/);o="global";if(t===null){p.type="_whatToTrace"}else{if(t[1].match(/^(persistent)$/)){o=RegExp.$1;p.type="_session_uid"}else{p.type=t[1]}}return p.init()};p.$on("$locationChangeSuccess",k);n=0;p.updateTree=function(y,s,q,v,x,u){var w,r,t;p.waiting=true;r=a[p.type]?a[p.type]:p.type==="_updateTime"?a._startTime:a._whatToTrace;w=r[q](p.type,y,x);if(u>b&&f[p.type]){if(t=f[p.type](p.type,y,q,v,x)){v++;w=t;q=q-1}else{v=0}}else{v=0}return m.get(scriptname+"sessions/"+o+"?"+w).then(function(A){var D,B,z,E,C;D=A.data;if(D.result){C=D.values;for(B=0,z=C.length;B<z;B++){E=C[B];n++;E.id="node"+n;if(q<r.length-1){E.nodes=[];E.level=q+1;E.query=w;E.over=v;if(p.type.match(/^(?:start|update)Time$/)){E.title=E.value.replace(/^(\d{8})(\d{2})(\d{2})$/,"$2:$3").replace(/^(\d{8})(\d{2})(\d)$/,"$2:$30").replace(/^(\d{8})(\d{2})$/,"$2h").replace(/^(\d{4})(\d{2})(\d{2})/,"$1-$2-$3")}}s.push(E)}if(y===""){p.total=D.total}}return p.waiting=false},function(z){return p.waiting=false})};p.init=function(){p.waiting=true;p.data=[];j.all([h.init(p.lang),p.updateTree("",p.data,0,0)]).then(function(){return p.waiting=false},function(q){return p.waiting=false});p.activeModule="sessions";return p.myStyle={color:"#ffb84d"}};l=i.path().match(/^\/(\w+)/);return p.type=l?l[1]:"_whatToTrace"}])}).call(this);
\ No newline at end of file

From 03c187ce062b987cc8ecea78c1eb71c75b1ec278 Mon Sep 17 00:00:00 2001
From: Christophe Maudoux <chrmdx@gmail.com>
Date: Mon, 30 Apr 2018 17:08:01 +0200
Subject: [PATCH 03/10] Fix langs

---
 lemonldap-ng-portal/site/htdocs/static/languages/de.json | 6 +++---
 lemonldap-ng-portal/site/htdocs/static/languages/en.json | 6 +++---
 lemonldap-ng-portal/site/htdocs/static/languages/es.json | 6 +++---
 lemonldap-ng-portal/site/htdocs/static/languages/it.json | 2 +-
 lemonldap-ng-portal/site/htdocs/static/languages/ro.json | 6 +++---
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/lemonldap-ng-portal/site/htdocs/static/languages/de.json b/lemonldap-ng-portal/site/htdocs/static/languages/de.json
index a4f2321b1..08ce94378 100644
--- a/lemonldap-ng-portal/site/htdocs/static/languages/de.json
+++ b/lemonldap-ng-portal/site/htdocs/static/languages/de.json
@@ -92,9 +92,9 @@
 "accountCreationSuccess":"Your account was successfully created.",
 "action":"Action",
 "anotherInformation":"Another information:",
-"areYouSure":"Are you sure ?",
-"askToRenew":"This application needs a more recent authentication. Do you want to reauthenticate ?",
-"askToUpgrade":"This application needs an higher authentication level. Do you want to reauthenticate ?",
+"areYouSure":"Are you sure?",
+"askToRenew":"This application needs a more recent authentication. Do you want to reauthenticate?",
+"askToUpgrade":"This application needs an higher authentication level. Do you want to reauthenticate?",
 "authPortal":"Authentication portal",
 "authRemaining":"%s authentications remaining, change your password!",
 "autoAccept":"Automatically accept in 30 seconds",
diff --git a/lemonldap-ng-portal/site/htdocs/static/languages/en.json b/lemonldap-ng-portal/site/htdocs/static/languages/en.json
index 58b6480bc..805271a4d 100644
--- a/lemonldap-ng-portal/site/htdocs/static/languages/en.json
+++ b/lemonldap-ng-portal/site/htdocs/static/languages/en.json
@@ -92,9 +92,9 @@
 "accountCreationSuccess":"Your account was successfully created.",
 "action":"Action",
 "anotherInformation":"Another information:",
-"areYouSure":"Are you sure ?",
-"askToRenew":"This application needs a more recent authentication. Do you want to reauthenticate ?",
-"askToUpgrade":"This application needs an higher authentication level. Do you want to reauthenticate ?",
+"areYouSure":"Are you sure?",
+"askToRenew":"This application needs a more recent authentication. Do you want to reauthenticate?",
+"askToUpgrade":"This application needs an higher authentication level. Do you want to reauthenticate?",
 "authPortal":"Authentication portal",
 "authRemaining":"%s authentications remaining, change your password!",
 "autoAccept":"Automatically accept in 30 seconds",
diff --git a/lemonldap-ng-portal/site/htdocs/static/languages/es.json b/lemonldap-ng-portal/site/htdocs/static/languages/es.json
index 706889357..68b2e3602 100644
--- a/lemonldap-ng-portal/site/htdocs/static/languages/es.json
+++ b/lemonldap-ng-portal/site/htdocs/static/languages/es.json
@@ -92,9 +92,9 @@
 "accountCreationSuccess":"Your account was successfully created.",
 "action":"Action",
 "anotherInformation":"Another information:",
-"areYouSure":"Are you sure ?",
-"askToRenew":"This application needs a more recent authentication. Do you want to reauthenticate ?",
-"askToUpgrade":"This application needs an higher authentication level. Do you want to reauthenticate ?",
+"areYouSure":"Are you sure?",
+"askToRenew":"This application needs a more recent authentication. Do you want to reauthenticate?",
+"askToUpgrade":"This application needs an higher authentication level. Do you want to reauthenticate?",
 "authPortal":"Authentication portal",
 "authRemaining":"%s authentications remaining, change your password!",
 "autoAccept":"Automatically accept in 30 seconds",
diff --git a/lemonldap-ng-portal/site/htdocs/static/languages/it.json b/lemonldap-ng-portal/site/htdocs/static/languages/it.json
index 072f648ec..67cf8c6bf 100644
--- a/lemonldap-ng-portal/site/htdocs/static/languages/it.json
+++ b/lemonldap-ng-portal/site/htdocs/static/languages/it.json
@@ -151,7 +151,7 @@
 "mail":"Mail",
 "mailSent2":"Vi é stato inviato un messaggio via mail",
 "maintenanceMode":"Questa applicazione è in manutenzione, prova a connetterti più tardi",
-"maxNumberof2FDevicesReached":"Maximum number of 2F devices reached !!!",
+"maxNumberof2FDevicesReached":"Maximum number of 2F devices reached!!!",
 "name":"Name",
 "newMessages":"Nuovo(i) messaggio(i)",
 "newPassword":"Nuova password",
diff --git a/lemonldap-ng-portal/site/htdocs/static/languages/ro.json b/lemonldap-ng-portal/site/htdocs/static/languages/ro.json
index dda72eb28..5e30afb4c 100644
--- a/lemonldap-ng-portal/site/htdocs/static/languages/ro.json
+++ b/lemonldap-ng-portal/site/htdocs/static/languages/ro.json
@@ -92,9 +92,9 @@
 "accountCreationSuccess":"Your account was successfully created.",
 "action":"Action",
 "anotherInformation":"Another information:",
-"areYouSure":"Are you sure ?",
-"askToRenew":"This application needs a more recent authentication. Do you want to reauthenticate ?",
-"askToUpgrade":"This application needs an higher authentication level. Do you want to reauthenticate ?",
+"areYouSure":"Are you sure?",
+"askToRenew":"This application needs a more recent authentication. Do you want to reauthenticate?",
+"askToUpgrade":"This application needs an higher authentication level. Do you want to reauthenticate?",
 "authPortal":"Authentication portal",
 "authRemaining":"%s authentications remaining, change your password!",
 "autoAccept":"Automatically accept in 30 seconds",

From 5a97e0dc4c4c6a2567e7821df4db7e87ea2226a3 Mon Sep 17 00:00:00 2001
From: Christophe Maudoux <chrmdx@gmail.com>
Date: Mon, 30 Apr 2018 20:04:30 +0200
Subject: [PATCH 04/10] Modify 2FManagment icon

---
 .../htdocs/static/common/icons/2FManagment.png  | Bin 612 -> 547 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/lemonldap-ng-portal/site/htdocs/static/common/icons/2FManagment.png b/lemonldap-ng-portal/site/htdocs/static/common/icons/2FManagment.png
index d70d33e34340a8832db3d39defe895d8070b2d4a..d9e5d2c6d4e65b457488540a874f8321f2e651b4 100644
GIT binary patch
delta 496
zcmV<M0T2G<1fv9yJ%0-m000XU0RWnu7ytkO2XskIMF-*p9uWv6J0LOJ00057Nkl<Z
zILnQbziU%b6vsd3y!U7btq@4+BG{y*gWAP56xVLjiaI$+5&r<EinEJTf{22O2yTL-
zT~)e@n}S;cZU%pwT5VqP?s0gp$$PJ@=DXhe`QCHB=N|dK^?$@BUNs1Ccq)hh2neyv
z$jBga#&74r%C%7J<|#Y7`G?o7PxPY*lKY~95F4rpB7&-*B18ta*Q#8a>4&~W13rA~
z@uRy9z_C)1f(NZHI~=CwT8%5SyZq{zr~oE1JiK#Zj+a;G{t0g^O@PIWBH+xZmM3{|
zvC2XTjs%Xo=YOlL%$GB8BL@!+%#327)GJCU7*J40y`oGPbp)^0xSoRnd=Sjw{l_j#
zkGecvUtqBUXCAk+aD6`<8zdF%>Dk-QyeUtO1t%3`4W7U20G+YmI0L}2eFx*f!xr+t
zEe(eb+S^LnCQz82a_JVbqe`dU`r6~<{dVSoqmu!h8)@^2fsHa~9x&$<(*^9->D)dz
z=!YYNe&lGLtFf_oK+k3n?jD{&=#<9l4404Z{5P<?Jl{9@`Ql-Zt$T<?_$ml{+n3tt
mq!4F@GZ;9-iAS`&9{vR(o3j0+-Ii?t0000<MNUMnLSTZ%k?pPk

delta 562
zcmV-20?qxS1mpyeJ%0_?000fw0YWI7cmMzZ2XskIMF-*p92FuRrcM>C0005;Nkl<Z
zILnojO=}ZT6o#L3=OZ>vEKRa44QOjB-4+)jE`+!c+`AF~KyhQGvBd_fA}++GP;k+W
zKR_3uAovelD1Hq1RTou6o2J-KlbL&5q|;8LDfsT@G7smy?|*r(1k=Z_ma@)6BZ4Df
z1V9kspcE8Pl-NQ$R>H{EC7hqowN^AW-T3}?wbha4jwOmM8CMwe3_}@*;fzqsx?0LP
zQpmWhZAVf4Ole`zGuPb6LV4H=o&~Mn08cNCj4B+x_~h%W9uGXfJj%J{FSKfv`Mhst
zH`^9hfLO7~Pk$H2@-qrmV7w1Jm-o$LaxPnQ6S@)F{D<{+@kG&|$@%8AYZz&UcKLI&
zy)w1*sgb~&waQ%1H@6db&q3Q-JV)}rBUK|51aiJ3=RHS)6nrBMCvpL745yYpz6QqQ
zn<pPw)#}i_cawXQy6_$TA=e0W_9I{;j8}jl1=sq)0DlHR_jwBU-#1=<3m>K6yBs3Z
zZ&kat4}}3-NmZ@~PHcBn2>?lz(lf%?Ziw0oA6S(ttLE05$@J70SIVWc<?IgtSG)XP
zNqSeMaO~IhiXOPPkj%x66`Elj?bdVguaE?W2TcDABCAwNM;7wFndLv_2$8$K9oGv3
z&U|af;wuP<fRXNVmi-)1z^Y;uZ1+3*xfMVD0~l4?s~-;)V*mgE07*qoM6N<$f{;A~
AR{#J2


From 89acef54c6b369dcf85a4f83ff8d21137d0d58e0 Mon Sep 17 00:00:00 2001
From: Christophe Maudoux <chrmdx@gmail.com>
Date: Mon, 30 Apr 2018 20:05:04 +0200
Subject: [PATCH 05/10] Fix langs

---
 .../site/htdocs/static/languages/fr.json         | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/lemonldap-ng-manager/site/htdocs/static/languages/fr.json b/lemonldap-ng-manager/site/htdocs/static/languages/fr.json
index 3eb353b7c..617f34cfd 100644
--- a/lemonldap-ng-manager/site/htdocs/static/languages/fr.json
+++ b/lemonldap-ng-manager/site/htdocs/static/languages/fr.json
@@ -24,7 +24,7 @@
 "_userDB":"Utilisateur",
 "_url":"URL d'origine",
 "_utime":"Tampon de la session",
-"2faSessions":"Explorateur de sessions 2ndFA",
+"2faSessions":"Explorateur sessions 2ndFA",
 "2ndFA":"Seconds Facteurs",
 "actives":"Actives",
 "activeTimer":"Délai d'acceptation automatique",
@@ -131,7 +131,7 @@
 "casSrvMetaDataOptionsUrl":"URL du serveur",
 "casSrvMetaDataNodes":"Serveurs CAS",
 "casSrvName":"Nom du serveur CAS",
-"casStorage":"Nom du module des session CAS",
+"casStorage":"Nom du module des sessions CAS",
 "casStorageOptions":"Options du module des sessions CAS",
 "categoryName":"Nom de la catégorie",
 "cda":"Domaines multiples",
@@ -402,7 +402,7 @@
 "modulesTitle":"Modules utilisés",
 "multiIp":"Multi IP",
 "multipleSessions":"Sessions multiples",
-"multiValuesSeparator":"Separateur",
+"multiValuesSeparator":"Séparateur",
 "name":"Nom",
 "needConfirmation":"Une nouvelle configuration est disponible. Pour sauvegarder celle-ci, cocher la case à côté du bouton 'sauver'",
 "networkProblem":"Problème de réseau",
@@ -504,15 +504,15 @@
 "oidcServiceMetaDataJWKSURI":"JWKS",
 "oidcServiceMetaDataKeys":"Clefs",
 "oidcServiceMetaDataRegistrationURI":"Enregistrement",
-"oidcServiceMetaDataSecurity":"Securité",
+"oidcServiceMetaDataSecurity":"Sécurité",
 "oidcServiceMetaDataEndSessionURI":"Fin de session",
 "oidcServiceMetaDataAuthnContext":"Contexte d'authentification",
 "oidcServiceMetaDataSessions":"Sessions",
 "oidcServicePrivateKeySig":"Clef privée de signature",
 "oidcServicePublicKeySig":"Clef publique de signature",
 "oidcServiceKeyIdSig":"Identifiant de clef de signature",
-"oidcStorage":"Nom du module de sessions",
-"oidcStorageOptions":"Options du module de sessions",
+"oidcStorage":"Nom du module des sessions",
+"oidcStorageOptions":"Options du module des sessions",
 "oidcOPMetaDataNodes":"Fournisseurs OpenID Connect",
 "oidcRPMetaDataNodes":"Clients OpenID Connect",
 "oidcOPMetaDataOptionsPrompt":"Interaction",
@@ -660,7 +660,7 @@
 "saveReport":"Rapport de sauvegarde",
 "savingConfirmation":"Confirmation de sauvegarde",
 "search":"Rechercher ...",
-"secondFactors":"Second facteurs",
+"secondFactors":"Seconds facteurs",
 "securedCookie":"Cookie sécurisé (HTTPS)",
 "security":"Sécurité",
 "serverError":"Erreur du serveur",
@@ -911,7 +911,7 @@
 "samlIdPResolveCookie":"Nom du cookie de résolution IDP",
 "samlPartnerName":"Nom du partenaire SAML",
 "samlMetadataForceUTF8":"Conversion des métadonnées en UTF8",
-"samlStorage":"Nom du module des session SAML",
+"samlStorage":"Nom du module des sessions SAML",
 "samlStorageOptions":"Options du module des sessions SAML",
 "samlAuthnContextMap":"Contextes d'authentification",
 "samlAuthnContextMapPassword":"Mot de passe",

From f1b2a6d587f7b1c7ad60e9a76b9ada6396944afc Mon Sep 17 00:00:00 2001
From: Christophe Maudoux <chrmdx@gmail.com>
Date: Mon, 30 Apr 2018 20:05:23 +0200
Subject: [PATCH 06/10] Typo

---
 .../lib/Lemonldap/NG/Manager/Attributes.pm    | 74 +++++++++----------
 .../site/coffee/sessions.coffee               |  2 +-
 .../site/htdocs/static/js/sessions.js         |  4 +-
 3 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Attributes.pm b/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Attributes.pm
index daeab2cc0..0e002527c 100644
--- a/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Attributes.pm
+++ b/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Attributes.pm
@@ -8,12 +8,12 @@ sub types {
         'authParamsText' => {
             'test' => sub {
                 1;
-            }
+              }
         },
         'blackWhiteList' => {
             'test' => sub {
                 1;
-            }
+              }
         },
         'bool' => {
             'msgFail' => '__notABoolean__',
@@ -36,17 +36,17 @@ sub types {
                         split( /\n/, $@, 0 ) )
                 );
                 return $err ? ( 1, "__badExpression__: $err" ) : 1;
-            }
+              }
         },
         'catAndAppList' => {
             'test' => sub {
                 1;
-            }
+              }
         },
         'file' => {
             'test' => sub {
                 1;
-            }
+              }
         },
         'hostname' => {
             'form'    => 'text',
@@ -80,48 +80,48 @@ qr/^(?:(?:(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.])*(?:[a-zA-Z][-a-
                       if $_ =~ /exportedvars$/i and defined $conf->{$_}{$val};
                 }
                 return 1, "__unknownAttrOrMacro__: $val";
-            }
+              }
         },
         'longtext' => {
             'test' => sub {
                 1;
-            }
+              }
         },
         'menuApp' => {
             'test' => sub {
                 1;
-            }
+              }
         },
         'menuCat' => {
             'test' => sub {
                 1;
-            }
+              }
         },
         'oidcmetadatajson' => {
             'test' => sub {
                 1;
-            }
+              }
         },
         'oidcmetadatajwks' => {
             'test' => sub {
                 1;
-            }
+              }
         },
         'oidcOPMetaDataNode' => {
             'test' => sub {
                 1;
-            }
+              }
         },
         'oidcRPMetaDataNode' => {
             'test' => sub {
                 1;
-            }
+              }
         },
         'password' => {
             'msgFail' => '__malformedValue__',
             'test'    => sub {
                 1;
-            }
+              }
         },
         'pcre' => {
             'form' => 'text',
@@ -132,7 +132,7 @@ qr/^(?:(?:(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.])*(?:[a-zA-Z][-a-
                       }
                 };
                 return $@ ? ( 0, "__badRegexp__: $@" ) : 1;
-            }
+              }
         },
         'PerlModule' => {
             'form'    => 'text',
@@ -142,17 +142,17 @@ qr/^(?:(?:(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.])*(?:[a-zA-Z][-a-
         'portalskin' => {
             'test' => sub {
                 1;
-            }
+              }
         },
         'portalskinbackground' => {
             'test' => sub {
                 1;
-            }
+              }
         },
         'post' => {
             'test' => sub {
                 1;
-            }
+              }
         },
         'RSAPrivateKey' => {
             'test' => sub {
@@ -160,7 +160,7 @@ qr/^(?:(?:(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.])*(?:[a-zA-Z][-a-
 m[^(?:(?:\-+\s*BEGIN\s+(?:RSA\s+)?PRIVATE\s+KEY\s*\-+\r?\n)?[a-zA-Z0-9/\+\r\n]+={0,2}(?:\r?\n\-+\s*END\s+(?:RSA\s+)PRIVATE\s+KEY\s*\-+)?[\r\n]*)?$]s
                   ? 1
                   : ( 1, '__badPemEncoding__' );
-            }
+              }
         },
         'RSAPublicKey' => {
             'test' => sub {
@@ -168,7 +168,7 @@ m[^(?:(?:\-+\s*BEGIN\s+(?:RSA\s+)?PRIVATE\s+KEY\s*\-+\r?\n)?[a-zA-Z0-9/\+\r\n]+=
 m[^(?:(?:\-+\s*BEGIN\s+PUBLIC\s+KEY\s*\-+\r?\n)?[a-zA-Z0-9/\+\r\n]+={0,2}(?:\r?\n\-+\s*END\s+PUBLIC\s+KEY\s*\-+)?[\r\n]*)?$]s
                   ? 1
                   : ( 1, '__badPemEncoding__' );
-            }
+              }
         },
         'RSAPublicKeyOrCertificate' => {
             'test' => sub {
@@ -176,37 +176,37 @@ m[^(?:(?:\-+\s*BEGIN\s+PUBLIC\s+KEY\s*\-+\r?\n)?[a-zA-Z0-9/\+\r\n]+={0,2}(?:\r?\
 m[^(?:(?:\-+\s*BEGIN\s+(?:PUBLIC\s+KEY|CERTIFICATE)\s*\-+\r?\n)?[a-zA-Z0-9/\+\r\n]+={0,2}(?:\r?\n\-+\s*END\s+(?:PUBLIC\s+KEY|CERTIFICATE)\s*\-+)?[\r\n]*)?$]s
                   ? 1
                   : ( 1, '__badPemEncoding__' );
-            }
+              }
         },
         'rule' => {
             'test' => sub {
                 1;
-            }
+              }
         },
         'samlAssertion' => {
             'test' => sub {
                 1;
-            }
+              }
         },
         'samlAttribute' => {
             'test' => sub {
                 1;
-            }
+              }
         },
         'samlIDPMetaDataNode' => {
             'test' => sub {
                 1;
-            }
+              }
         },
         'samlService' => {
             'test' => sub {
                 1;
-            }
+              }
         },
         'samlSPMetaDataNode' => {
             'test' => sub {
                 1;
-            }
+              }
         },
         'select' => {
             'test' => sub {
@@ -216,19 +216,19 @@ m[^(?:(?:\-+\s*BEGIN\s+(?:PUBLIC\s+KEY|CERTIFICATE)\s*\-+\r?\n)?[a-zA-Z0-9/\+\r\
                 return $test
                   ? 1
                   : ( 1, "Invalid value '$_[0]' for this select" );
-            }
+              }
         },
         'subContainer' => {
             'keyTest' => qr/\w/,
             'test'    => sub {
                 1;
-            }
+              }
         },
         'text' => {
             'msgFail' => '__malformedValue__',
             'test'    => sub {
                 1;
-            }
+              }
         },
         'trool' => {
             'msgFail' => '__authorizedValues__: -1, 0, 1',
@@ -1035,7 +1035,7 @@ qr/^(?:\*\.)?(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.])*(?:[a-zA-Z][
                             split( /\n/, $@, 0 ) )
                     );
                     return $err ? ( 1, "__badExpression__: $err" ) : 1;
-                }
+                  }
             },
             'type' => 'keyTextContainer'
         },
@@ -1210,7 +1210,7 @@ qr/^(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.])*(?:[a-zA-Z][-a-zA-Z0-
                           and defined $conf->{$_}{$val};
                     }
                     return 1, "__unknownAttrOrMacro__: $val";
-                }
+                  }
             },
             'type' => 'doubleHash'
         },
@@ -1498,7 +1498,7 @@ qr/^(?:\*\.)?(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.])*(?:[a-zA-Z][
                             split( /\n/, $@, 0 ) )
                     );
                     return $err ? ( 1, "__badExpression__: $err" ) : 1;
-                }
+                  }
             },
             'type' => 'ruleContainer'
         },
@@ -3004,19 +3004,19 @@ qr/(?:(?:https?):\/\/(?:(?:(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.]
             'default' => 0,
             'select'  => [
                 {
-                    'k' => '0',
+                    'k' => 0,
                     'v' => 'unsecuredCookie'
                 },
                 {
-                    'k' => '1',
+                    'k' => 1,
                     'v' => 'securedCookie'
                 },
                 {
-                    'k' => '2',
+                    'k' => 2,
                     'v' => 'doubleCookie'
                 },
                 {
-                    'k' => '3',
+                    'k' => 3,
                     'v' => 'doubleCookieForSingleSession'
                 }
             ],
diff --git a/lemonldap-ng-manager/site/coffee/sessions.coffee b/lemonldap-ng-manager/site/coffee/sessions.coffee
index fdd6490fa..fe8ee2ad4 100644
--- a/lemonldap-ng-manager/site/coffee/sessions.coffee
+++ b/lemonldap-ng-manager/site/coffee/sessions.coffee
@@ -1,5 +1,5 @@
 ###
-# Session explorer
+# Sessions explorer
 ###
 
 # Max number of session to display (see overScheme)
diff --git a/lemonldap-ng-manager/site/htdocs/static/js/sessions.js b/lemonldap-ng-manager/site/htdocs/static/js/sessions.js
index 2dfb65e34..5d65862b2 100644
--- a/lemonldap-ng-manager/site/htdocs/static/js/sessions.js
+++ b/lemonldap-ng-manager/site/htdocs/static/js/sessions.js
@@ -1,7 +1,7 @@
-// Generated by CoffeeScript 1.10.0
+// Generated by CoffeeScript 1.9.3
 
 /*
- * Session explorer
+ * Sessions explorer
  */
 
 (function() {

From f2c287fc3741cae495e3c4f7580a742976d235dd Mon Sep 17 00:00:00 2001
From: Christophe Maudoux <chrmdx@gmail.com>
Date: Mon, 30 Apr 2018 21:27:15 +0200
Subject: [PATCH 07/10] Typo

---
 lemonldap-ng-manager/site/htdocs/static/languages/en.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lemonldap-ng-manager/site/htdocs/static/languages/en.json b/lemonldap-ng-manager/site/htdocs/static/languages/en.json
index 2945364b2..3f4d48938 100644
--- a/lemonldap-ng-manager/site/htdocs/static/languages/en.json
+++ b/lemonldap-ng-manager/site/htdocs/static/languages/en.json
@@ -639,7 +639,7 @@
 "restConfigServer":"REST configuration server",
 "restore":"Restore",
 "restoreConf":"Restore configuration",
-"rest2f":"REST Second Factor",
+"rest2f":"REST second factor",
 "rest2fActivation":"Activation",
 "rest2fAuthnLevel":"Authentication level",
 "rest2fInitArgs":"Init Arguments",

From 6cca6a8678b014f277de7f7b76a7aae57b7934ed Mon Sep 17 00:00:00 2001
From: Christophe Maudoux <chrmdx@gmail.com>
Date: Mon, 30 Apr 2018 21:37:51 +0200
Subject: [PATCH 08/10] Typo

---
 lemonldap-ng-manager/site/templates/2ndfa.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lemonldap-ng-manager/site/templates/2ndfa.tpl b/lemonldap-ng-manager/site/templates/2ndfa.tpl
index 2487e6006..4b1c3db8d 100644
--- a/lemonldap-ng-manager/site/templates/2ndfa.tpl
+++ b/lemonldap-ng-manager/site/templates/2ndfa.tpl
@@ -12,7 +12,7 @@
       <div class="navbar navbar-default">
         <div class="navbar-collapse">
           <ul class="nav navbar-nav" role="grid">
-            <li><a id="a-persistent" role="row"><i class="glyphicon glyphicon-exclamation-sign"></i> {{translate('2faSessions')}}</a></li>
+            <li><a id="a-persistent" role="row"><i class="glyphicon glyphicon-exclamation-sign"></i> {{translate('2faSessions')}} &nbsp;&nbsp;</a></li>
             <form name="filterForm">
               <div class="form-check ">&nbsp;&nbsp;&nbsp;
                 <input type="checkbox" ng-model="U2FCheck" class="form-check-input"  ng-true-value="'2'" ng-false-value="'1'" ng-change="search2FA()"/>

From 43e7056efad93681072ad1a03903f77f78d8ef76 Mon Sep 17 00:00:00 2001
From: Christophe Maudoux <chrmdx@gmail.com>
Date: Mon, 30 Apr 2018 23:01:53 +0200
Subject: [PATCH 09/10] Display 2fregisters link only if at once a 2f device is
 registered (#1383)

---
 .../lib/Lemonldap/NG/Portal/Main/Menu.pm               |  6 ++++++
 lemonldap-ng-portal/site/templates/bootstrap/menu.tpl  | 10 ++++++----
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Menu.pm b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Menu.pm
index c28f6892e..2c20722e8 100644
--- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Menu.pm
+++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Menu.pm
@@ -94,9 +94,15 @@ sub params {
             $req->param("tab") // '' )
           || "applist";
     }
+    
     $res{DISPLAY_MODULES} = $self->displayModules($req);
     $res{AUTH_ERROR_TYPE} =
       $req->error_type( $res{AUTH_ERROR} = $req->menuError );
+    
+    # Display menu 2fRegisters link only if a 2F device is registered
+    # $res{SFAManagment} = $self->_sfEngine->display2fRegisters($req, $req->userData) ???
+    $res{SFAManagment} = $req->userData->{_2fDevices} =~ /\w+/;
+    $self->logger->debug( "Display 2fRegisters link ? ". $res{SFAManagment} );
 
     return %res;
 }
diff --git a/lemonldap-ng-portal/site/templates/bootstrap/menu.tpl b/lemonldap-ng-portal/site/templates/bootstrap/menu.tpl
index 6a76887a5..2b986b756 100644
--- a/lemonldap-ng-portal/site/templates/bootstrap/menu.tpl
+++ b/lemonldap-ng-portal/site/templates/bootstrap/menu.tpl
@@ -74,10 +74,12 @@
             <span class="caret"></span>
           </a>
           <ul class="dropdown-menu" role="menu">
-			<li><a href="/2fregisters">
-              <img src="<TMPL_VAR NAME="STATIC_PREFIX">common/icons/2FManagment.png" width="16" height="16" alt="refresh" />
-              <span trspan="2FManagment">2FManagment</span>
-            </a></li>
+			<TMPL_IF NAME="SFAManagment">
+			  <li><a href="/2fregisters">
+	              <img src="<TMPL_VAR NAME="STATIC_PREFIX">common/icons/2FManagment.png" width="16" height="16" alt="refresh" />
+	              <span trspan="2FManagment">2FManagment</span>
+	          </a></li>
+            </TMPL_IF>
             <li><a href="/refresh">
               <img src="<TMPL_VAR NAME="STATIC_PREFIX">common/icons/arrow_refresh.png" width="16" height="16" alt="refresh" />
               <span trspan="refreshrights">Refresh</span>

From ed1229800aa55bcb1ea285ede0ae94d54c7c0760 Mon Sep 17 00:00:00 2001
From: Christophe Maudoux <chrmdx@gmail.com>
Date: Mon, 30 Apr 2018 23:01:53 +0200
Subject: [PATCH 10/10] Display 2fregisters link only if at least a 2f device
 is registered (#1383)

---
 .../lib/Lemonldap/NG/Portal/Main/Menu.pm               |  6 ++++++
 lemonldap-ng-portal/site/templates/bootstrap/menu.tpl  | 10 ++++++----
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Menu.pm b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Menu.pm
index c28f6892e..2c20722e8 100644
--- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Menu.pm
+++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Menu.pm
@@ -94,9 +94,15 @@ sub params {
             $req->param("tab") // '' )
           || "applist";
     }
+    
     $res{DISPLAY_MODULES} = $self->displayModules($req);
     $res{AUTH_ERROR_TYPE} =
       $req->error_type( $res{AUTH_ERROR} = $req->menuError );
+    
+    # Display menu 2fRegisters link only if a 2F device is registered
+    # $res{SFAManagment} = $self->_sfEngine->display2fRegisters($req, $req->userData) ???
+    $res{SFAManagment} = $req->userData->{_2fDevices} =~ /\w+/;
+    $self->logger->debug( "Display 2fRegisters link ? ". $res{SFAManagment} );
 
     return %res;
 }
diff --git a/lemonldap-ng-portal/site/templates/bootstrap/menu.tpl b/lemonldap-ng-portal/site/templates/bootstrap/menu.tpl
index 6a76887a5..2b986b756 100644
--- a/lemonldap-ng-portal/site/templates/bootstrap/menu.tpl
+++ b/lemonldap-ng-portal/site/templates/bootstrap/menu.tpl
@@ -74,10 +74,12 @@
             <span class="caret"></span>
           </a>
           <ul class="dropdown-menu" role="menu">
-			<li><a href="/2fregisters">
-              <img src="<TMPL_VAR NAME="STATIC_PREFIX">common/icons/2FManagment.png" width="16" height="16" alt="refresh" />
-              <span trspan="2FManagment">2FManagment</span>
-            </a></li>
+			<TMPL_IF NAME="SFAManagment">
+			  <li><a href="/2fregisters">
+	              <img src="<TMPL_VAR NAME="STATIC_PREFIX">common/icons/2FManagment.png" width="16" height="16" alt="refresh" />
+	              <span trspan="2FManagment">2FManagment</span>
+	          </a></li>
+            </TMPL_IF>
             <li><a href="/refresh">
               <img src="<TMPL_VAR NAME="STATIC_PREFIX">common/icons/arrow_refresh.png" width="16" height="16" alt="refresh" />
               <span trspan="refreshrights">Refresh</span>