Commit bcb979d2 authored by Lisa Seeto's avatar Lisa Seeto Committed by Gerrit Code Review
Browse files

Merge "Bug 1912685: Upgrading ssphp to 1.19.0"

parents 8d56d116 6f82b14e
......@@ -66,7 +66,7 @@ ifdef composer
@echo "Composer already installed..."
else
@echo "Installing Composer..."
@curl -sS https://getcomposer.org/installer | php -- --install-dir=external --version=1.10.16
@curl -sS https://getcomposer.org/installer | php -- --install-dir=external
endif
initcomposer: installcomposer
......@@ -84,7 +84,7 @@ ifdef simplesamlphp
@echo "SimpleSAMLphp already exists - doing nothing"
else
@echo "Pulling SimpleSAMLphp from download ..."
@curl -sSL https://github.com/simplesamlphp/simplesamlphp/releases/download/v1.18.7/simplesamlphp-1.18.7.tar.gz | tar --transform 's/simplesamlphp-[0-9]+\.[0-9]+\.[0-9]+/simplesamlphp/x1' -C htdocs/auth/saml/extlib -xzf - # SimpleSAMLPHP release tarball already has all composer dependencies.
@curl -sSL https://github.com/simplesamlphp/simplesamlphp/releases/download/v1.19.0/simplesamlphp-1.19.0.tar.gz | tar --transform 's/simplesamlphp-[0-9]+\.[0-9]+\.[0-9]+/simplesamlphp/x1' -C htdocs/auth/saml/extlib -xzf - # SimpleSAMLPHP release tarball already has all composer dependencies.
@php external/composer.phar --working-dir=htdocs/auth/saml/extlib/simplesamlphp require predis/predis
@echo "Copying www/resources/* files to sp/resources/ ..."
@cp -R htdocs/auth/saml/extlib/simplesamlphp/www/resources/ htdocs/auth/saml/sp/
......
......@@ -60,8 +60,15 @@ function xmldb_auth_saml_upgrade($oldversion=0) {
}
}
if ($oldversion < 2020073000) {
set_config_plugin('auth', 'saml', 'version', '1.18.7');
set_config_plugin('auth', 'saml', 'version', '1.18.7');
}
if ($oldversion < 2021021700) {
set_config_plugin('auth', 'saml', 'version', '1.19.0');
// delete the external/composer.phar so on next make ssphp it will download composer v2
if (file_exists(get_config('docroot') . '../external/composer.phar') && !@unlink(get_config('docroot') . '../external/composer.phar')) {
$extroot = preg_replace('/\/htdocs/', '', get_config('docroot'));
log_warn(get_string('samlneedtoremovephar', 'auth.saml', $extroot . 'external/composer.phar'), true, false);
}
}
return $status;
}
......@@ -140,3 +140,4 @@ $string['noentityidpneednamespace'] = 'Does your XML EntityDescriptor tag requir
$string['novalidauthinstanceprovided'] = 'Your selection is not possible. Please select a different institution.';
$string['identityprovider'] = 'Identity Provider';
$string['selectmigrateto'] = 'Select institution to move to...';
$string['samlneedtoremovephar'] = 'Unable to remove %s file. Please delete the file and then run "make ssphp" again.';
......@@ -590,7 +590,7 @@ class PluginAuthSaml extends PluginAuth {
public static function install_auth_default() {
// Set library version to download
set_config_plugin('auth', 'saml', 'version', '1.18.7');
set_config_plugin('auth', 'saml', 'version', '1.19.0');
}
private static function delete_old_certificates() {
......
......@@ -11,8 +11,8 @@
defined('INTERNAL') || die();
$config = new stdClass();
$config->version = 2020073000;
$config->release = '1.8.0';
$config->version = 2021021700;
$config->release = '1.9.0';
$config->name = 'saml';
$config->requires_config = 1;
$config->requires_parent = 0;
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment