Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Xavier Bachelot
lemonldap-ng
Commits
f63e5eac
Commit
f63e5eac
authored
Mar 07, 2017
by
Yadd
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add version in conf (to be used later with #797)
parent
16380cb5
Changes
12
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
20 additions
and
2 deletions
+20
-2
_example/conf/lmConf-1.json
_example/conf/lmConf-1.json
+1
-0
lemonldap-ng-common/lib/Lemonldap/NG/Common/Cli.pm
lemonldap-ng-common/lib/Lemonldap/NG/Common/Cli.pm
+1
-0
lemonldap-ng-common/lib/Lemonldap/NG/Common/Conf/RESTServer.pm
...ldap-ng-common/lib/Lemonldap/NG/Common/Conf/RESTServer.pm
+1
-1
lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Attributes.pm
lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Attributes.pm
+3
-0
lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Build/Attributes.pm
...p-ng-manager/lib/Lemonldap/NG/Manager/Build/Attributes.pm
+4
-0
lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Conf/Parser.pm
lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Conf/Parser.pm
+1
-0
lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Conf/Zero.pm
lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Conf/Zero.pm
+1
-0
lemonldap-ng-manager/site/htdocs/static/forms/home.html
lemonldap-ng-manager/site/htdocs/static/forms/home.html
+4
-0
lemonldap-ng-manager/site/htdocs/static/languages/en.json
lemonldap-ng-manager/site/htdocs/static/languages/en.json
+1
-0
lemonldap-ng-manager/site/htdocs/static/languages/fr.json
lemonldap-ng-manager/site/htdocs/static/languages/fr.json
+1
-0
lemonldap-ng-manager/t/80-attributes.t
lemonldap-ng-manager/t/80-attributes.t
+1
-1
lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Issuer/OpenIDConnect.pm
...ng-portal/lib/Lemonldap/NG/Portal/Issuer/OpenIDConnect.pm
+1
-0
No files found.
_example/conf/lmConf-1.json
View file @
f63e5eac
...
...
@@ -86,6 +86,7 @@
"authentication"
:
"Demo"
,
"cfgAuthor"
:
"The LemonLDAP::NG team"
,
"cfgNum"
:
1
,
"cfgVersion"
:
"2.0.0"
,
"cookieName"
:
"lemonldap"
,
"demoExportedVars"
:
{
"cn"
:
"cn"
,
...
...
lemonldap-ng-common/lib/Lemonldap/NG/Common/Cli.pm
View file @
f63e5eac
...
...
@@ -39,6 +39,7 @@ Num : $conf->{cfgNum}
Author : $conf->{cfgAuthor}
Author IP: $conf->{cfgAuthorIP}
Date : }
.
localtime
(
$conf
->
{
cfgDate
}
)
.
qq{
Version : $conf->{cfgVersion}
Log : $conf->{cfgLog}
}
;
}
...
...
lemonldap-ng-common/lib/Lemonldap/NG/Common/Conf/RESTServer.pm
View file @
f63e5eac
...
...
@@ -646,7 +646,7 @@ sub metadatas {
return
$self
->
sendError
(
$req
,
undef
,
400
)
if
(
$req
->
error
);
return
$self
->
sendError
(
$req
,
"
Configuration without cfgNum
",
500
)
unless
(
defined
$res
->
{
cfgNum
}
);
foreach
my
$key
(
qw(cfgAuthor cfgDate cfgAuthorIP cfgLog)
)
{
foreach
my
$key
(
qw(cfgAuthor cfgDate cfgAuthorIP cfgLog
cfgVersion
)
)
{
$res
->
{
$key
}
=
$self
->
getConfKey
(
$req
,
$key
);
}
...
...
lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Attributes.pm
View file @
f63e5eac
...
...
@@ -670,6 +670,9 @@ qr/(?:(?:https?):\/\/(?:(?:(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.]
'
default
'
=>
0
,
'
type
'
=>
'
int
'
},
'
cfgVersion
'
=>
{
'
type
'
=>
'
text
'
},
'
checkXSS
'
=>
{
'
default
'
=>
1
,
'
type
'
=>
'
bool
'
...
...
lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Build/Attributes.pm
View file @
f63e5eac
...
...
@@ -236,6 +236,10 @@ sub attributes {
type
=>
'
longtext
',
documentation
=>
'
Configuration update log
',
},
cfgVersion
=>
{
type
=>
'
text
',
documentation
=>
'
Version of LLNG which build configuration
',
},
confirmFormMethod
=>
{
type
=>
"
select
",
select
=>
...
...
lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Conf/Parser.pm
View file @
f63e5eac
...
...
@@ -127,6 +127,7 @@ sub scanTree {
||
'
_whatToTrace
'
}
//
"
anonymous
";
$self
->
newConf
->
{
cfgAuthorIP
}
=
$self
->
req
->
address
;
$self
->
newConf
->
{
cfgDate
}
=
time
;
$self
->
newConf
->
{
cfgVersion
}
=
$VERSION
;
$self
->
newConf
->
{
key
}
||=
join
(
'',
map
{
chr
(
int
(
rand
(
94
)
)
+
33
)
}
(
1
..
16
)
);
...
...
lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Conf/Zero.pm
View file @
f63e5eac
...
...
@@ -166,6 +166,7 @@ sub zeroConf {
'
securedCookie
'
=>
0
,
'
cookieName
'
=>
'
lemonldap
',
'
cfgAuthor
'
=>
'
The LemonLDAP::NG team
',
'
cfgVersion
'
=>
$VERSION
,
'
exportedVars
'
=>
{
'
UA
'
=>
'
HTTP_USER_AGENT
'
},
...
...
lemonldap-ng-manager/site/htdocs/static/forms/home.html
View file @
f63e5eac
...
...
@@ -25,6 +25,10 @@
<th><span
trspan=
"date"
></span></th>
<td>
{{currentCfg.date}}
</td>
</tr>
<tr
ng-if=
"currentCfg.cfgVersion"
>
<th><span
trspan=
"cfgVersion"
></span></th>
<td>
{{currentCfg.cfgVersion}}
</td>
</tr>
<tr
ng-if=
"currentCfg.cfgLog"
>
<th><span
trspan=
"cfgLog"
></span></th>
<td
id=
"cfglog"
>
{{currentCfg.cfgLog}}
</td>
...
...
lemonldap-ng-manager/site/htdocs/static/languages/en.json
View file @
f63e5eac
...
...
@@ -118,6 +118,7 @@
"cspConnect"
:
"Ajax destinations"
,
"cspFont"
:
"Font source"
,
"cfgLog"
:
"Resume"
,
"cfgVersion"
:
"Configuration version"
,
"checkXSS"
:
"Check XSS attacks"
,
"clickHereToForce"
:
"Click here to force"
,
"choiceParams"
:
"Choice parameters"
,
...
...
lemonldap-ng-manager/site/htdocs/static/languages/fr.json
View file @
f63e5eac
...
...
@@ -118,6 +118,7 @@
"cspConnect"
:
"Destinations des requêtes Ajax"
,
"cspFont"
:
"Font source"
,
"cfgLog"
:
"Résumé"
,
"cfgVersion"
:
"Version de la configuration"
,
"checkXSS"
:
"Contrôler les attaques XSS"
,
"clickHereToForce"
:
"Cliquer ici pour forcer"
,
"choiceParams"
:
"Paramètres des choix"
,
...
...
lemonldap-ng-manager/t/80-attributes.t
View file @
f63e5eac
...
...
@@ -22,7 +22,7 @@ my @notManagedAttributes = (
'
oidcOPMetaDataOptions
',
'
vhostOptions
',
# Metadatas (added by manager itself)
'
cfgAuthor
',
'
cfgAuthorIP
',
'
cfgNum
',
'
cfgDate
',
'
cfgLog
',
'
cfgAuthor
',
'
cfgAuthorIP
',
'
cfgNum
',
'
cfgDate
',
'
cfgLog
',
'
cfgVersion
',
# HTML template parameter (for PSGI) (must be set in lemonldap-ng.ini)
'
staticPrefix
',
...
...
lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Issuer/OpenIDConnect.pm
View file @
f63e5eac
...
...
@@ -1113,6 +1113,7 @@ sub registration {
$conf
->
{
cfgAuthor
}
=
"
OpenID Connect Registration (
$client_name
)
";
$conf
->
{
cfgAuthorIP
}
=
$source_ip
;
$conf
->
{
cfgVersion
}
=
$VERSION
;
$conf
->
{
oidcRPMetaDataExportedVars
}
->
{
$rp
}
=
{};
$conf
->
{
oidcRPMetaDataOptions
}
->
{
$rp
}
->
{
oidcRPMetaDataOptionsClientID
}
=
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment