dani
/
lemonldap-ng
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Import 1.9 changes

This commit is contained in:
Xavier Guimard 2016-12-11 10:45:59 +00:00
parent a959d77e1c
commit 1274d75a6a
9 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Makefile
View File

@ -168,7 +168,9 @@ PORTALLIBSTOREMOVEFORDEBIAN=$(RPORTALSKINSDIR)/bootstrap/fonts \
$(RPORTALSKINSDIR)/bootstrap/js/bootstrap* \ $(RPORTALSKINSDIR)/bootstrap/js/bootstrap* \
$(RPORTALSKINSDIR)/common/js/jquery-* \ $(RPORTALSKINSDIR)/common/js/jquery-* \
$(RPORTALSKINSDIR)/common/js/jquery.cookie* $(RPORTALSKINSDIR)/common/js/jquery.cookie*
DOCLIBSTOREMOVEFORDEBIAN=pages/documentation/current/lib/tpl/bootstrap3 pages/documentation/current/lib/scripts/jquery-ui*.js DOCLIBSTOREMOVEFORDEBIAN=pages/documentation/current/lib/tpl/bootstrap3 \
pages/documentation/current/lib/scripts/jquery-ui*.js \
pages/documentation/current/bootswatch/3.3.4/flatly/bootstrap.min.css
DOCEXTERNALLIBS=$(DOCLIBSTOREMOVEFORDEBIAN) DOCEXTERNALLIBS=$(DOCLIBSTOREMOVEFORDEBIAN)
MANAGEREXTERNALLIBS=$(RMANAGERSTATICDIR)/bwr/ MANAGEREXTERNALLIBS=$(RMANAGERSTATICDIR)/bwr/
PORTALEXTERNALLIBS=$(PORTALLIBSTOREMOVEFORDEBIAN) $(RPORTALSKINSDIR)/common/js/jquery* PORTALEXTERNALLIBS=$(PORTALLIBSTOREMOVEFORDEBIAN) $(RPORTALSKINSDIR)/common/js/jquery*
@ -943,10 +945,7 @@ debian-packages: debian-dist
rm -rf lemonldap-ng-$$version && \ rm -rf lemonldap-ng-$$version && \
$(UNCOMPRESS) lemonldap-ng_$$version.orig.$(COMPRESSSUFFIX) && \ $(UNCOMPRESS) lemonldap-ng_$$version.orig.$(COMPRESSSUFFIX) && \
cd lemonldap-ng-$$version && \ cd lemonldap-ng-$$version && \
debuild -us -uc -b --lintian-opts -i \ dpkg-buildpackage -us -uc
--lintian-opts -v --lintian-opts -I --lintian-opts -E \
--lintian-opts --color --lintian-opts auto --lintian-opts -L \
--lintian-opts +=pedantic
# Developper corner # Developper corner
# ----------------- # -----------------

2
debian/lemonldap-ng-doc.docs vendored
View File

@ -1 +1 @@
doc/* debian/tmp/usr/share/doc/lemonldap-ng-doc/*

2
debian/lemonldap-ng-fr-doc.docs vendored
View File

@ -1 +1 @@
po-doc/fr/* debian/tmp/usr/share/doc/lemonldap-ng-fr-doc/fr-doc/*

7
debian/rules vendored
View File

@ -27,7 +27,7 @@ override_dh_auto_build:
$(MAKE) all $(MAKE) all
override_dh_auto_install: override_dh_auto_install:
$(MAKE) install install_fr_doc_site \ $(MAKE) install \
DESTDIR=$(CURDIR)/debian/tmp \ DESTDIR=$(CURDIR)/debian/tmp \
PREFIX=/usr \ PREFIX=/usr \
LMPREFIX=/usr/share/lemonldap-ng/ \ LMPREFIX=/usr/share/lemonldap-ng/ \
@ -49,7 +49,10 @@ override_dh_auto_install:
DEFDOCDIR=/usr/share/doc/lemonldap-ng-doc \ DEFDOCDIR=/usr/share/doc/lemonldap-ng-doc \
FRDOCDIR=/usr/share/doc/lemonldap-ng-fr-doc \ FRDOCDIR=/usr/share/doc/lemonldap-ng-fr-doc \
PROD=yes PROD=yes
$(MAKE) install_fr_doc_site \
DESTDIR=$(CURDIR)/debian/tmp \
DOCDIR=/usr/share/doc/lemonldap-ng-fr-doc \
USEDEBIANLIBS=yes
mkdir $(TMP)/$(LMSHAREDIR)/portal mkdir $(TMP)/$(LMSHAREDIR)/portal
mv $(TMP)/$(LMVARDIR)/portal/*.pl $(TMP)/$(LMSHAREDIR)/portal/ mv $(TMP)/$(LMVARDIR)/portal/*.pl $(TMP)/$(LMSHAREDIR)/portal/
for i in handler portal manager test; do \ for i in handler portal manager test; do \

2
lemonldap-ng-common/scripts/lemonldap-ng-cli
View File

@ -79,7 +79,7 @@ lemonldap-ng-cli - Command-line manager for Lemonldap::NG web-SSO system.
=head1 DESCRIPTION =head1 DESCRIPTION
lemonldap-ng-cli is a command line client that can be used to do some actions lemonldap-ng-cli is a command line client that can be used to do some actions
on Lemonldap::NG configuration. Commands are detailled in on Lemonldap::NG configuration. Commands are detailed in
L<Lemonldap::NG::Manager::Cli> and L<Lemonldap::NG::Common::CLi> L<Lemonldap::NG::Manager::Cli> and L<Lemonldap::NG::Common::CLi>
=head1 SEE ALSO =head1 SEE ALSO

2
lemonldap-ng-manager/site/static/languages/en.json
View File

@ -420,7 +420,7 @@
"oidcRPName": "OpenID Connect RP Name", "oidcRPName": "OpenID Connect RP Name",
"oidcRPStateTimeout": "State session timeout", "oidcRPStateTimeout": "State session timeout",
"oidcServiceMetaData": "OpenID Connect Service", "oidcServiceMetaData": "OpenID Connect Service",
"oidcServiceMetaDataAuthorizeURI": "Autorization", "oidcServiceMetaDataAuthorizeURI": "Authorization",
"oidcServiceMetaDataEndPoints": "End points", "oidcServiceMetaDataEndPoints": "End points",
"oidcServiceMetaDataJWKSURI": "JWKS", "oidcServiceMetaDataJWKSURI": "JWKS",
"oidcServiceMetaDataKeys": "Keys", "oidcServiceMetaDataKeys": "Keys",

4
lemonldap-ng-portal/example/oauth2.pl
View File

@ -703,9 +703,9 @@ else {
print print
"<a href=\"$hybrid_redirect_url\" class=\"btn btn-info\" role=\"button\">Hybrid Flow</a>\n"; "<a href=\"$hybrid_redirect_url\" class=\"btn btn-info\" role=\"button\">Hybrid Flow</a>\n";
print print
"<a href=\"$request_redirect_url\" class=\"btn btn-info\" role=\"button\">Autorization Code Flow with request</a>\n"; "<a href=\"$request_redirect_url\" class=\"btn btn-info\" role=\"button\">Authorization Code Flow with request</a>\n";
print print
"<a href=\"$request_uri_redirect_url\" class=\"btn btn-info\" role=\"button\">Autorization Code Flow with request_uri</a>\n"; "<a href=\"$request_uri_redirect_url\" class=\"btn btn-info\" role=\"button\">Authorization Code Flow with request_uri</a>\n";
print "</div>\n"; print "</div>\n";
print "<h2 class=\"text-center\">Configuration</h2>\n"; print "<h2 class=\"text-center\">Configuration</h2>\n";
print "<div class=\"text-center\">\n"; print "<div class=\"text-center\">\n";

2
lemonldap-ng-portal/lib/Lemonldap/NG/Portal.pm
View File

@ -110,7 +110,7 @@ described below.
The portal part inherits from L<CGI> so yo can use it both with Apache 1 and 2 The portal part inherits from L<CGI> so yo can use it both with Apache 1 and 2
and use all L<CGI> features. and use all L<CGI> features.
=head2 Authentication, Autorization, Accounting =head2 Authentication, Authorization, Accounting
=head3 B<Authentication> =head3 B<Authentication>

4
lemonldap-ng-portal/lib/Lemonldap/NG/Portal/_OpenIDConnect.pm
View File

@ -389,7 +389,7 @@ sub buildHybridAuthnResponse {
} }
## @method String getAuthorizationCodeAccessToken(String op, String code, String auth_method) ## @method String getAuthorizationCodeAccessToken(String op, String code, String auth_method)
# Get Token response with autorization code # Get Token response with authorization code
# @param op OpenIP Provider configuration key # @param op OpenIP Provider configuration key
# @param code Code # @param code Code
# @param auth_method Authentication Method # @param auth_method Authentication Method
@ -1591,7 +1591,7 @@ Build Authentication Response URI for Hybrid Flow
=head2 getAuthorizationCodeAccessToken =head2 getAuthorizationCodeAccessToken
Get Token response with autorization code Get Token response with authorization code
=head2 checkTokenResponseValidity =head2 checkTokenResponseValidity