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
mahara
mahara
Commits
47840482
Commit
47840482
authored
Nov 12, 2019
by
Cecilia Vela Gurovic
Committed by
Gerrit Code Review
Nov 12, 2019
Browse files
Options
Browse Files
Download
Plain Diff
Merge "Security Bug 1851418: Update SimpleSAMLphp to 1.17.7"
parents
ac281c55
886ed4ff
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
4 deletions
+7
-4
Makefile
Makefile
+1
-1
htdocs/auth/saml/db/upgrade.php
htdocs/auth/saml/db/upgrade.php
+3
-0
htdocs/auth/saml/lib.php
htdocs/auth/saml/lib.php
+1
-1
htdocs/auth/saml/version.php
htdocs/auth/saml/version.php
+2
-2
No files found.
Makefile
View file @
47840482
...
...
@@ -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.17.
6
/simplesamlphp-1.17.
6
.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.17.
7
/simplesamlphp-1.17.
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
View file @
47840482
...
...
@@ -47,6 +47,9 @@ function xmldb_auth_saml_upgrade($oldversion=0) {
if
(
$oldversion
<
2019091600
)
{
set_config_plugin
(
'auth'
,
'saml'
,
'version'
,
'1.17.6'
);
}
if
(
$oldversion
<
2019110700
)
{
set_config_plugin
(
'auth'
,
'saml'
,
'version'
,
'1.17.7'
);
}
return
$status
;
}
htdocs/auth/saml/lib.php
View file @
47840482
...
...
@@ -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.17.
6
'
);
set_config_plugin
(
'auth'
,
'saml'
,
'version'
,
'1.17.
7
'
);
}
private
static
function
delete_old_certificates
()
{
...
...
htdocs/auth/saml/version.php
View file @
47840482
...
...
@@ -11,8 +11,8 @@
defined
(
'INTERNAL'
)
||
die
();
$config
=
new
stdClass
();
$config
->
version
=
2019
0916
00
;
$config
->
release
=
'1.5.
0
'
;
$config
->
version
=
2019
1107
00
;
$config
->
release
=
'1.5.
1
'
;
$config
->
name
=
'saml'
;
$config
->
requires_config
=
1
;
$config
->
requires_parent
=
0
;
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