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.

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

#817: sp/module.php references a file that no longer exists #827

Merged
merged 2 commits into from
Nov 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion classes/auth.php
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,8 @@ class auth extends \auth_plugin_base {
'nameidasattrib' => 0,
'flagresponsetype' => saml2_settings::OPTION_FLAGGED_LOGIN_MESSAGE,
'flagredirecturl' => '',
'flagmessage' => '' // Set in constructor.
'flagmessage' => '', // Set in constructor.
'tempdir' => '/tmp/simplesaml'
];

/**
Expand Down
1 change: 1 addition & 0 deletions config/config.php
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
'debug' => ['saml' => $saml2auth->is_debugging()],
'logging.level' => $saml2auth->is_debugging() ? SimpleSAML\Logger::DEBUG : SimpleSAML\Logger::ERR,
'logging.handler' => $saml2auth->config->logtofile ? 'file' : 'errorlog',
'tempdir' => $saml2auth->config->tempdir,

// SSP has a %srcip token, but instead use $remoteip so Moodle handle's which header to use.
'logging.format' => '%date{%b %d %H:%M:%S} ' . $remoteip . ' %process %level %stat[%trackid] %msg',
Expand Down
3 changes: 3 additions & 0 deletions lang/en/auth_saml2.php
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,9 @@
$string['spmetadatasign_help'] = 'Sign the SP Metadata.';
$string['spmetadatasign'] = 'SP Metadata signature';
$string['spmetadata'] = 'SP Metadata';
$string['tempdirdefault'] = '/tmp/simplesaml';
$string['tempdir_help'] = 'A directory where SimpleSAMLphp can save temporary files';
$string['tempdir'] = 'SimpleSAMLphp temporary directory';
$string['sspversion'] = 'SimpleSAMLphp version';
$string['stateorprovincename'] = 'State or Province';
$string['status'] = 'Status';
Expand Down
10 changes: 10 additions & 0 deletions settings.php
Original file line number Diff line number Diff line change
Expand Up @@ -360,6 +360,16 @@
1,
$yesno));

// SAMLPHP tempdir
$settings->add(new admin_setting_configtext(
'auth_saml2/tempdir',
get_string('tempdir', 'auth_saml2'),
get_string('tempdir_help', 'auth_saml2'),
get_string('tempdirdefault', 'auth_saml2'),
PARAM_TEXT,
50,
3));

// SAMLPHP version.
$authplugin = get_auth_plugin('saml2');
$settings->add(new setting_textonly(
Expand Down
2 changes: 1 addition & 1 deletion sp/module.php
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,4 @@
$_SERVER['SERVER_PORT'] = '443';
}

require($CFG->dirroot.'/auth/saml2/.extlib/simplesamlphp/www/module.php');
require($CFG->dirroot.'/auth/saml2/.extlib/simplesamlphp/public/module.php');
Loading