Commit 4aab2c06 authored by Robert Lyon's avatar Robert Lyon Committed by Gerrit Code Review
Browse files

Merge "Bug 1598974: Update sso_session to handle SHA-256 session ids"

parents 4e771573 6232e77c
......@@ -266,7 +266,7 @@
<FIELD NAME="token" TYPE="char" LENGTH="40" NOTNULL="true"/>
<FIELD NAME="confirmtimeout" TYPE="int" LENGTH="10" NOTNULL="true" SEQUENCE="false" />
<FIELD NAME="expires" TYPE="int" LENGTH="10" NOTNULL="true" SEQUENCE="false" />
<FIELD NAME="sessionid" TYPE="char" LENGTH="40" NOTNULL="true"/>
<FIELD NAME="sessionid" TYPE="char" LENGTH="64" NOTNULL="true"/>
</FIELDS>
<KEYS>
<KEY NAME="primary" TYPE="primary" FIELDS="userid,instanceid" />
......
......@@ -4506,5 +4506,15 @@ function xmldb_core_upgrade($oldversion=0) {
WHERE (institution IS NULL OR institution = '') AND deleted = 0", array());
}
if ($oldversion < 2016070500) {
log_debug('Extend sso_session.sessionid to 64 characters because we now use SHA-256 session ids.');
$table = new XMLDBTable('sso_session');
$field = new XMLDBField('sessionid');
$field->setType(XMLDB_TYPE_CHAR);
$field->setLength(64);
$field->setNotNull(true);
change_field_precision($table, $field);
}
return $status;
}
......@@ -16,7 +16,7 @@ $config = new stdClass();
// See https://wiki.mahara.org/wiki/Developer_Area/Version_Numbering_Policy
// For upgrades on stable branches, increment the version by one. On master, use the date.
$config->version = 2016062900;
$config->version = 2016070500;
$config->series = '16.10';
$config->release = '16.10dev';
$config->minupgradefrom = 2012080604;
......
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