Commit f64ccffd authored by Lisa Seeto's avatar Lisa Seeto Committed by Robert Lyon
Browse files

Bug 1889485: Security Upgrade SimpleSAML 1.18.4 to 1.18.7 



 - upgrade to version 1.18.7

Change-Id: I4e7ca4de32a4c69224c184013c15f92069cc97ff
Signed-off-by: default avatarLisa Seeto <lisaseeto@catalyst.net.nz>
parent 6551ec53

Makefile

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,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.4/simplesamlphp-1.18.4.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.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.

	@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/

htdocs/auth/saml/db/upgrade.php

+3 −0
Original line number Diff line number Diff line
@@ -53,6 +53,9 @@ function xmldb_auth_saml_upgrade($oldversion=0) { 
    if ($oldversion < 2020030100) {

        set_config_plugin('auth', 'saml', 'version', '1.18.4');

    }

    if ($oldversion < 2020030101) {

         set_config_plugin('auth', 'saml', 'version', '1.18.7');

    }



    return $status;

}

htdocs/auth/saml/lib.php

+1 −1
Original line number Diff line number Diff line
@@ -393,7 +393,7 @@ class PluginAuthSaml extends PluginAuth { 


    public static function install_auth_default() {

        // Set library version to download

        set_config_plugin('auth', 'saml', 'version', '1.18.4');

        set_config_plugin('auth', 'saml', 'version', '1.18.7');

    }



    private static function delete_old_certificates() {

htdocs/auth/saml/version.php

+2 −2
Original line number Diff line number Diff line
@@ -11,8 +11,8 @@ 
defined('INTERNAL') || die();



$config = new stdClass();

$config->version = 2020030100;

$config->release = '1.6.0';

$config->version = 2020030101;

$config->release = '1.8.0';

$config->name = 'saml';

$config->requires_config = 1;

$config->requires_parent = 0;