Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix issue of removing SAML conf not disabling SAML on non-MW pages #1212

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Fix issue of removing SAML conf not disabling SAML on non-MW pages #1212

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b557e15
Update download.php
revansx Jun 6, 2019
d14ceec
Update index.php
revansx Jun 6, 2019
95e6752
Update index.php.j2
revansx Jun 6, 2019
e8aa0eb
Merge remote-tracking branch 'rich/patch-3' into revansx-saml-changes
jamesmontalvo3 Jul 4, 2019
d530946
Merge remote-tracking branch 'rich/patch-2' into revansx-saml-changes
jamesmontalvo3 Jul 4, 2019
7834406
Merge remote-tracking branch 'rich/patch-4' into revansx-saml-changes
jamesmontalvo3 Jul 4, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions src/roles/htdocs/files/BackupDownload/download.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,13 +79,12 @@


// if there's a SAML config file, we need to authenticate with SAML, like, now.
if ( is_file( $m_deploy.'/SAMLConfig.php' ) ) {
require_once $m_htdocs.'/NonMediaWikiSimpleSamlAuth.php';
}
else {
{% if saml_public is defined %}
require_once __DIR__ . '/NonMediaWikiSimpleSamlAuth.php';
{% else %}
header('HTTP/1.0 403 Forbidden');
echo "Backup downloading is not permitted without Single Sign On";
}
{% endif %}

$as = new SimpleSAML_Auth_Simple('default-sp');
$as->requireAuth();
Expand Down
9 changes: 4 additions & 5 deletions src/roles/htdocs/files/BackupDownload/index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,12 @@
require_once '/opt/.deploy-meza/config.php';

// if there's a SAML config file, we need to authenticate with SAML, like, now.
if ( is_file( $m_deploy.'/SAMLConfig.php' ) ) {
require_once $m_htdocs.'/NonMediaWikiSimpleSamlAuth.php';
}
else {
{% if saml_public is defined %}
require_once __DIR__ . '/NonMediaWikiSimpleSamlAuth.php';
{% else %}
header('HTTP/1.0 403 Forbidden');
echo "Backup downloading is not permitted without Single Sign On";
}
{% endif %}

$as = new SimpleSAML_Auth_Simple( 'default-sp' );
$as->requireAuth();
Expand Down
6 changes: 3 additions & 3 deletions src/roles/htdocs/templates/index.php.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?php

// if there's a SAML config file, we need to authenticate with SAML, like, now.
if ( is_file( '/opt/.deploy-meza/SAMLConfig.php' ) ) {
require_once __DIR__ . '/NonMediaWikiSimpleSamlAuth.php';
}
{% if saml_public is defined %}
require_once __DIR__ . '/NonMediaWikiSimpleSamlAuth.php';
{% endif %}

require_once "WikiBlender/index.php";