merge of contributions from Sylvain Beucler
* Makefile: remove ending slash from dest directories, set owner of data
directory to www-data
* saml2.php: use baseUrl config key as baseUrl for generating metadatas
* fix orthographe accés => accès
* locate lasso.php using init_get('extension_dir')
* add handling of .php extension fo lassospkit_configgen.inc.ph
This commit is contained in:
<bdauvergne@entrouvert.com> 1206961631 +0200
parent
e93b9286e8
commit
fbf4835ae0
13
Makefile
13
Makefile
|
|
@ -4,11 +4,12 @@ DIR:=$(shell basename `pwd`)
|
|||
FULL=$(NAME)-$(VERSION)
|
||||
ZIP=$(FULL).zip
|
||||
TGZ=$(FULL).tar.gz
|
||||
DATAPREFIX=/usr/share/
|
||||
DATAPREFIX=/usr/share
|
||||
DATADIR=$(DATAPREFIX)/$(NAME)
|
||||
PHPINCLUDEDIR=/usr/share/php/
|
||||
DOCPREFIX=/usr/share/doc/
|
||||
PHPINCLUDEDIR=/usr/share/php
|
||||
DOCPREFIX=/usr/share/doc
|
||||
DOCDIR=$(DOCPREFIX)/$(NAME)
|
||||
HTTPD_USER=www-data
|
||||
|
||||
.PHONY: zip distclean dist install all clean
|
||||
|
||||
|
|
@ -30,11 +31,13 @@ install:
|
|||
install -d $(DESTDIR)$(DOCDIR)/html
|
||||
install -m 644 -t $(DESTDIR)$(DATADIR)/include include/*
|
||||
install -m 644 -t $(DESTDIR)$(DATADIR)/endpoints endpoints/*
|
||||
install -m 644 -t $(DESTDIR)$(DOCDIR)/exemples exemples/*
|
||||
install -m 644 -t $(DESTDIR)$(DOCDIR)/exemples exemples/*.*
|
||||
install -d $(DESTDIR)$(DOCDIR)
|
||||
ln -sf $(DATADIR)/include $(DESTDIR)$(PHPINCLUDEDIR)/$(NAME)
|
||||
ln -nfs $(DATADIR) $(DESTDIR)$(PHPINCLUDEDIR)/$(NAME)
|
||||
install -m 644 -t $(DESTDIR)$(DOCDIR)/html doc/*.html
|
||||
install -m 644 -t $(DESTDIR)$(DOCDIR) README INSTALL
|
||||
-mkdir -m 755 /var/lib/spkitlasso
|
||||
chown $(HTTPD_USER): /var/lib/spkitlasso
|
||||
|
||||
distclean:
|
||||
rm -rf $(FULL)
|
||||
|
|
|
|||
|
|
@ -183,7 +183,7 @@ function metadata() {
|
|||
$pkey = $datadir . "/" . PRIVATE_KEY;
|
||||
LassoSPKitUtils::extractPublicKey($pkey, $publickey, $error);
|
||||
try {
|
||||
$content = LassoSPKitMetadataSAML2::generateMetadata(dirname(LassoSPKitUtils::mydir()), LassoSPKitConfig::get('organization'), $publickey);
|
||||
$content = LassoSPKitMetadataSAML2::generateMetadata(LassoSPKitConfig::get('baseUrl'), LassoSPKitConfig::get('organization'), $publickey);
|
||||
if ($content) {
|
||||
header('Content-type: text/xml');
|
||||
echo $content;
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ function show($a) {
|
|||
<head>
|
||||
<link type="text/css" rel="stylesheet" href="endpoints/style.css">
|
||||
</head>
|
||||
<h1>Points d'accés</h1>
|
||||
<h1>Points d'accès</h1>
|
||||
<ul>
|
||||
<?
|
||||
$myself = LassoSPKitUtils::myself();
|
||||
|
|
@ -23,7 +23,7 @@ show(lassospkit_login_redirect($myself));
|
|||
show(lassospkit_federate_redirect($myself));
|
||||
show(lassospkit_logout_redirect($myself));
|
||||
show(lassospkit_defederation_redirect($myself));
|
||||
show('endpoints/configure');
|
||||
show('endpoints/configure.php');
|
||||
|
||||
if (isset($_GET['userid'])) {
|
||||
lassospkit_set_userid($_GET['userid']);
|
||||
|
|
|
|||
|
|
@ -15,7 +15,6 @@ class LassoSPKitConfig {
|
|||
'mysql_password' => '',
|
||||
'mysql_database' => '',
|
||||
'mysql_table' => '_lassospkit_userid2nameid',
|
||||
'lasso_lib' => 'lasso.php', /* Where is lasso PHP binding ? */
|
||||
'debug' => '0', /* Activate extra debugging */
|
||||
'organization' => "", /* Nom de l'organisation */
|
||||
'conformance' => "",
|
||||
|
|
@ -65,6 +64,8 @@ class LassoSPKitConfig {
|
|||
}
|
||||
static function init() {
|
||||
if (! self::$instance) {
|
||||
/* Where is lasso PHP binding ? */
|
||||
self::$default_values['lasso_lib'] = ini_get('extension_dir').'/lasso.php';
|
||||
self::$file = lassospkit_datadir() . '/lassospkit_config.ini';
|
||||
self::$instance = self::loadIni(self::$file);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,20 +10,24 @@ class LassoSPKitConfigUIGen
|
|||
private $base;
|
||||
|
||||
function __construct() {
|
||||
$suffix = "";
|
||||
if (LassoSPKitConfig::get('showExtension')) {
|
||||
$suffix = ".php";
|
||||
}
|
||||
$this->special_input = array(
|
||||
'organization' =>
|
||||
array('Nom du service',
|
||||
'text'),
|
||||
'baseUrl' =>
|
||||
array('Base des URLS des points d\'accés', 'text'),
|
||||
array('Base des URLS des points d\'accès', 'text'),
|
||||
'gruik' =>
|
||||
array('URL des métadatas SAML 2.0 du SP',
|
||||
'url',
|
||||
LassoSPKitUtils::relativePathToURL("saml2/metadata")),
|
||||
LassoSPKitUtils::relativePathToURL("saml2" . $suffix . "/metadata")),
|
||||
'gruik2' =>
|
||||
array('URL des métadatas Liberty 1.2 du SP',
|
||||
'url',
|
||||
LassoSPKitUtils::relativePathToURL("liberty/metadata")),
|
||||
LassoSPKitUtils::relativePathToURL("liberty" . $suffix . "/metadata")),
|
||||
'idp_metadata_url' =>
|
||||
array('URL des métadatas du service d\'authentification',
|
||||
'text'),
|
||||
|
|
@ -228,7 +232,7 @@ class LassoSPKitConfigUIGen
|
|||
}
|
||||
$metabase = LassoSPKitHelper::getMetadataDir($conformance);
|
||||
if (! is_dir($metabase)) {
|
||||
if (! @mkdir($metabase)) {
|
||||
if (! @mkdir($metabase, 0755, 1)) {
|
||||
$error = "MakeConfig: Cannot create directory $metabase";
|
||||
return 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,8 +4,7 @@
|
|||
* in an unique directory with you application, you can just make it return "../data".
|
||||
*/
|
||||
function lassospkit_datadir() {
|
||||
// return '/var/lib/lassospkit/' . $_SERVER['HTTP_HOST'];
|
||||
return "/home/bdauvergne/public_html/data";
|
||||
return '/var/lib/spkitlasso/' . $_SERVER['HTTP_HOST'];
|
||||
//return "/home/bdauvergne/public_html/data";
|
||||
// return $_SERVER['DOCUMENT_ROOT'] . '/data';
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ function _lassospkit_make_redirect_url($endpoint, $return_url, $params) {
|
|||
$redirect = $redirect . '.php';
|
||||
}
|
||||
// Specific endpoint
|
||||
$redirect = $redirect . '/' . $endpoint;
|
||||
$redirect = $redirect . '.php/' . $endpoint;
|
||||
// Return url param
|
||||
$redirect = $redirect . "?return_url=" . urlencode($return_url);
|
||||
// Other params
|
||||
|
|
|
|||
Reference in New Issue