diff --git a/drupal-org.make b/drupal-org.make index 73dbc81..7e60d23 100644 --- a/drupal-org.make +++ b/drupal-org.make @@ -274,9 +274,9 @@ libraries[moono][directory_name] = "ckeditor/skins/moono" libraries[moono][type] = "library" libraries[simplesamlphp][download][type] = "get" -libraries[simplesamlphp][download][url] = "https://github.com/simplesamlphp/simplesamlphp/releases/download/v1.17.7/simplesamlphp-1.17.7.tar.gz" -libraries[simplesamlphp][patch][] = "https://www.drupal.org/files/issues/2019-11-06/remove_default_config_metadata-2613356-15.patch" -libraries[simplesamlphp][patch][] = "patches/simplesamlphp-saml_metadata_attributes.patch" +libraries[simplesamlphp][download][url] = "https://github.com/simplesamlphp/simplesamlphp/releases/download/v1.18.2/simplesamlphp-1.18.2.tar.gz" +libraries[simplesamlphp][patch][] = "patches/simplesamlphp-1.18_remove_config_metadata.patch" +libraries[simplesamlphp][patch][] = "patches/simplesamlphp-1.18_saml_metadata_attributes.patch" libraries[simplesamlphp][directory_name] = "simplesamlphp" libraries[simplesamlphp][type] = "library" diff --git a/patches/simplesamlphp-1.18_remove_config_metadata.patch b/patches/simplesamlphp-1.18_remove_config_metadata.patch new file mode 100644 index 0000000..9980d6b --- /dev/null +++ b/patches/simplesamlphp-1.18_remove_config_metadata.patch @@ -0,0 +1,1861 @@ +diff --git a/config/acl.php b/config/acl.php +deleted file mode 100644 +index cb760d0aa..000000000 +--- a/config/acl.php ++++ /dev/null +@@ -1,59 +0,0 @@ +- [ +- //['allow', 'equals', 'mail', 'admin1@example.org'], +- //['allow', 'has', 'groups', 'admin'], +- // The default action is to deny access. +- ], +- +- 'example-simple' => [ +- ['allow', 'equals', 'mail', 'admin1@example.org'], +- ['allow', 'equals', 'mail', 'admin2@example.org'], +- // The default action is to deny access. +- ], +- +- 'example-deny-some' => [ +- ['deny', 'equals', 'mail', 'eviluser@example.org'], +- ['allow'], // Allow everybody else. +- ], +- +- 'example-maildomain' => [ +- ['allow', 'equals-preg', 'mail', '/@example\.org$/'], +- // The default action is to deny access. +- ], +- +- 'example-allow-employees' => [ +- ['allow', 'has', 'eduPersonAffiliation', 'employee'], +- // The default action is to deny access. +- ], +- +- 'example-allow-employees-not-students' => [ +- ['deny', 'has', 'eduPersonAffiliation', 'student'], +- ['allow', 'has', 'eduPersonAffiliation', 'employee'], +- // The default action is to deny access. +- ], +- +- 'example-deny-student-except-one' => [ +- ['deny', 'and', +- ['has', 'eduPersonAffiliation', 'student'], +- ['not', 'equals', 'mail', 'user@example.org'], +- ], +- ['allow'], +- ], +- +- 'example-allow-or' => [ +- ['allow', 'or', +- ['equals', 'eduPersonAffiliation', 'student', 'member'], +- ['equals', 'mail', 'someuser@example2.org'], +- ], +- ], +- +- 'example-allow-all' => [ +- ['allow'], +- ], +-]; +diff --git a/config/authsources.php b/config/authsources.php +deleted file mode 100644 +index f2d562163..000000000 +--- a/config/authsources.php ++++ /dev/null +@@ -1,320 +0,0 @@ +- [ +- // The default is to use core:AdminPassword, but it can be replaced with +- // any authentication source. +- +- 'core:AdminPassword', +- ], +- +- +- // An authentication source which can authenticate against both SAML 2.0 +- // and Shibboleth 1.3 IdPs. +- 'default-sp' => [ +- 'saml:SP', +- +- // The entity ID of this SP. +- // Can be NULL/unset, in which case an entity ID is generated based on the metadata URL. +- 'entityID' => null, +- +- // The entity ID of the IdP this SP should contact. +- // Can be NULL/unset, in which case the user will be shown a list of available IdPs. +- 'idp' => null, +- +- // The URL to the discovery service. +- // Can be NULL/unset, in which case a builtin discovery service will be used. +- 'discoURL' => null, +- +- /* +- * The attributes parameter must contain an array of desired attributes by the SP. +- * The attributes can be expressed as an array of names or as an associative array +- * in the form of 'friendlyName' => 'name'. This feature requires 'name' to be set. +- * The metadata will then be created as follows: +- * +- */ +- /* +- 'name' => [ +- 'en' => 'A service', +- 'no' => 'En tjeneste', +- ], +- +- 'attributes' => [ +- 'attrname' => 'urn:oid:x.x.x.x', +- ], +- 'attributes.required' => [ +- 'urn:oid:x.x.x.x', +- ], +- */ +- ], +- +- +- /* +- 'example-sql' => [ +- 'sqlauth:SQL', +- 'dsn' => 'pgsql:host=sql.example.org;port=5432;dbname=simplesaml', +- 'username' => 'simplesaml', +- 'password' => 'secretpassword', +- 'query' => 'SELECT uid, givenName, email, eduPersonPrincipalName FROM users WHERE uid = :username ' . +- 'AND password = SHA2(CONCAT((SELECT salt FROM users WHERE uid = :username), :password), 256);', +- ], +- */ +- +- /* +- 'example-static' => [ +- 'exampleauth:StaticSource', +- 'uid' => ['testuser'], +- 'eduPersonAffiliation' => ['member', 'employee'], +- 'cn' => ['Test User'], +- ], +- */ +- +- /* +- 'example-userpass' => [ +- 'exampleauth:UserPass', +- +- // Give the user an option to save their username for future login attempts +- // And when enabled, what should the default be, to save the username or not +- //'remember.username.enabled' => false, +- //'remember.username.checked' => false, +- +- 'student:studentpass' => [ +- 'uid' => ['test'], +- 'eduPersonAffiliation' => ['member', 'student'], +- ], +- 'employee:employeepass' => [ +- 'uid' => ['employee'], +- 'eduPersonAffiliation' => ['member', 'employee'], +- ], +- ], +- */ +- +- /* +- 'crypto-hash' => [ +- 'authcrypt:Hash', +- // hashed version of 'verysecret', made with bin/pwgen.php +- 'professor:{SSHA256}P6FDTEEIY2EnER9a6P2GwHhI5JDrwBgjQ913oVQjBngmCtrNBUMowA==' => [ +- 'uid' => ['prof_a'], +- 'eduPersonAffiliation' => ['member', 'employee', 'board'], +- ], +- ], +- */ +- +- /* +- 'htpasswd' => [ +- 'authcrypt:Htpasswd', +- 'htpasswd_file' => '/var/www/foo.edu/legacy_app/.htpasswd', +- 'static_attributes' => [ +- 'eduPersonAffiliation' => ['member', 'employee'], +- 'Organization' => ['University of Foo'], +- ], +- ], +- */ +- +- /* +- // This authentication source serves as an example of integration with an +- // external authentication engine. Take a look at the comment in the beginning +- // of modules/exampleauth/lib/Auth/Source/External.php for a description of +- // how to adjust it to your own site. +- 'example-external' => [ +- 'exampleauth:External', +- ], +- */ +- +- /* +- 'yubikey' => [ +- 'authYubiKey:YubiKey', +- 'id' => '000', +- // 'key' => '012345678', +- ], +- */ +- +- /* +- 'facebook' => [ +- 'authfacebook:Facebook', +- // Register your Facebook application on http://www.facebook.com/developers +- // App ID or API key (requests with App ID should be faster; https://github.com/facebook/php-sdk/issues/214) +- 'api_key' => 'xxxxxxxxxxxxxxxx', +- // App Secret +- 'secret' => 'xxxxxxxxxxxxxxxx', +- // which additional data permissions to request from user +- // see http://developers.facebook.com/docs/authentication/permissions/ for the full list +- // 'req_perms' => 'email,user_birthday', +- // Which additional user profile fields to request. +- // When empty, only the app-specific user id and name will be returned +- // See https://developers.facebook.com/docs/graph-api/reference/v2.6/user for the full list +- // 'user_fields' => 'email,birthday,third_party_id,name,first_name,last_name', +- ], +- */ +- +- /* +- // LinkedIn OAuth Authentication API. +- // Register your application to get an API key here: +- // https://www.linkedin.com/secure/developer +- // Attributes definition: +- // https://developer.linkedin.com/docs/fields +- 'linkedin' => [ +- 'authlinkedin:LinkedIn', +- 'key' => 'xxxxxxxxxxxxxxxx', +- 'secret' => 'xxxxxxxxxxxxxxxx', +- 'attributes' => 'id,first-name,last-name,headline,summary,specialties,picture-url,email-address', +- ], +- */ +- +- /* +- // Microsoft Account (Windows Live ID) Authentication API. +- // Register your application to get an API key here: +- // https://apps.dev.microsoft.com/ +- 'windowslive' => [ +- 'authwindowslive:LiveID', +- 'key' => 'xxxxxxxxxxxxxxxx', +- 'secret' => 'xxxxxxxxxxxxxxxx', +- ], +- */ +- +- /* +- // Example of a LDAP authentication source. +- 'example-ldap' => [ +- 'ldap:LDAP', +- +- // Give the user an option to save their username for future login attempts +- // And when enabled, what should the default be, to save the username or not +- //'remember.username.enabled' => false, +- //'remember.username.checked' => false, +- +- // The hostname of the LDAP server. +- 'hostname' => 'ldap.example.org', +- +- // Whether SSL/TLS should be used when contacting the LDAP server. +- 'enable_tls' => true, +- +- // Whether debug output from the LDAP library should be enabled. +- // Default is FALSE. +- 'debug' => false, +- +- // The timeout for accessing the LDAP server, in seconds. +- // The default is 0, which means no timeout. +- 'timeout' => 0, +- +- // The port used when accessing the LDAP server. +- // The default is 389. +- 'port' => 389, +- +- // Set whether to follow referrals. AD Controllers may require FALSE to function. +- 'referrals' => true, +- +- // Which attributes should be retrieved from the LDAP server. +- // This can be an array of attribute names, or NULL, in which case +- // all attributes are fetched. +- 'attributes' => null, +- +- // The pattern which should be used to create the users DN given the username. +- // %username% in this pattern will be replaced with the users username. +- // +- // This option is not used if the search.enable option is set to TRUE. +- 'dnpattern' => 'uid=%username%,ou=people,dc=example,dc=org', +- +- // As an alternative to specifying a pattern for the users DN, it is possible to +- // search for the username in a set of attributes. This is enabled by this option. +- 'search.enable' => false, +- +- // The DN which will be used as a base for the search. +- // This can be a single string, in which case only that DN is searched, or an +- // array of strings, in which case they will be searched in the order given. +- 'search.base' => 'ou=people,dc=example,dc=org', +- +- // The attribute(s) the username should match against. +- // +- // This is an array with one or more attribute names. Any of the attributes in +- // the array may match the value the username. +- 'search.attributes' => ['uid', 'mail'], +- +- // Additional LDAP filters appended to the search attributes +- //'search.filter' => '(objectclass=inetorgperson)', +- +- // The username & password the SimpleSAMLphp should bind to before searching. If +- // this is left as NULL, no bind will be performed before searching. +- 'search.username' => null, +- 'search.password' => null, +- +- // If the directory uses privilege separation, +- // the authenticated user may not be able to retrieve +- // all required attribures, a privileged entity is required +- // to get them. This is enabled with this option. +- 'priv.read' => false, +- +- // The DN & password the SimpleSAMLphp should bind to before +- // retrieving attributes. These options are required if +- // 'priv.read' is set to TRUE. +- 'priv.username' => null, +- 'priv.password' => null, +- +- ], +- */ +- +- /* +- // Example of an LDAPMulti authentication source. +- 'example-ldapmulti' => [ +- 'ldap:LDAPMulti', +- +- // Give the user an option to save their username for future login attempts +- // And when enabled, what should the default be, to save the username or not +- //'remember.username.enabled' => false, +- //'remember.username.checked' => false, +- +- // Give the user an option to save their organization choice for future login +- // attempts. And when enabled, what should the default be, checked or not. +- //'remember.organization.enabled' => false, +- //'remember.organization.checked' => false, +- +- // The way the organization as part of the username should be handled. +- // Three possible values: +- // - 'none': No handling of the organization. Allows '@' to be part +- // of the username. +- // - 'allow': Will allow users to type 'username@organization'. +- // - 'force': Force users to type 'username@organization'. The dropdown +- // list will be hidden. +- // +- // The default is 'none'. +- 'username_organization_method' => 'none', +- +- // Whether the organization should be included as part of the username +- // when authenticating. If this is set to TRUE, the username will be on +- // the form @. If this is FALSE, the +- // username will be used as the user enters it. +- // +- // The default is FALSE. +- 'include_organization_in_username' => false, +- +- // A list of available LDAP servers. +- // +- // The index is an identifier for the organization/group. When +- // 'username_organization_method' is set to something other than 'none', +- // the organization-part of the username is matched against the index. +- // +- // The value of each element is an array in the same format as an LDAP +- // authentication source. +- 'employees' => [ +- // A short name/description for this group. Will be shown in a dropdown list +- // when the user logs on. +- // +- // This option can be a string or an array with language => text mappings. +- 'description' => 'Employees', +- +- // The rest of the options are the same as those available for +- // the LDAP authentication source. +- 'hostname' => 'ldap.employees.example.org', +- 'dnpattern' => 'uid=%username%,ou=employees,dc=example,dc=org', +- ], +- +- 'students' => [ +- 'description' => 'Students', +- +- 'hostname' => 'ldap.students.example.org', +- 'dnpattern' => 'uid=%username%,ou=students,dc=example,dc=org', +- ], +- ], +- */ +-]; +diff --git a/config/config.php b/config/config.php +deleted file mode 100644 +index 9d267be49..000000000 +--- a/config/config.php ++++ /dev/null +@@ -1,1177 +0,0 @@ +- 'simplesaml/', +- +- /* +- * The 'application' configuration array groups a set configuration options +- * relative to an application protected by SimpleSAMLphp. +- */ +- //'application' => [ +- /* +- * The 'baseURL' configuration option allows you to specify a protocol, +- * host and optionally a port that serves as the canonical base for all +- * your application's URLs. This is useful when the environment +- * observed in the server differs from the one observed by end users, +- * for example, when using a load balancer to offload TLS. +- * +- * Note that this configuration option does not allow setting a path as +- * part of the URL. If your setup involves URL rewriting or any other +- * tricks that would result in SimpleSAMLphp observing a URL for your +- * application's scripts different than the canonical one, you will +- * need to compute the right URLs yourself and pass them dynamically +- * to SimpleSAMLphp's API. +- */ +- //'baseURL' => 'https://example.com', +- //], +- +- /* +- * The following settings are *filesystem paths* which define where +- * SimpleSAMLphp can find or write the following things: +- * - 'certdir': The base directory for certificate and key material. +- * - 'loggingdir': Where to write logs. +- * - 'datadir': Storage of general data. +- * - 'tempdir': Saving temporary files. SimpleSAMLphp will attempt to create +- * this directory if it doesn't exist. +- * When specified as a relative path, this is relative to the SimpleSAMLphp +- * root directory. +- */ +- 'certdir' => 'cert/', +- 'loggingdir' => 'log/', +- 'datadir' => 'data/', +- 'tempdir' => '/tmp/simplesaml', +- +- /* +- * Some information about the technical persons running this installation. +- * The email address will be used as the recipient address for error reports, and +- * also as the technical contact in generated metadata. +- */ +- 'technicalcontact_name' => 'Administrator', +- 'technicalcontact_email' => 'na@example.org', +- +- /* +- * (Optional) The method by which email is delivered. Defaults to mail which utilizes the +- * PHP mail() function. +- * +- * Valid options are: mail, sendmail and smtp. +- */ +- //'mail.transport.method' => 'smtp', +- +- /* +- * Set the transport options for the transport method specified. The valid settings are relative to the +- * selected transport method. +- */ +- // // smtp mail transport options +- // 'mail.transport.options' => [ +- // 'host' => 'mail.example.org', // required +- // 'port' => 25, // optional +- // 'username' => 'user@example.org', // optional: if set, enables smtp authentication +- // 'password' => 'password', // optional: if set, enables smtp authentication +- // 'security' => 'tls', // optional: defaults to no smtp security +- // ], +- // // sendmail mail transport options +- // 'mail.transport.options' => [ +- // 'path' => '/usr/sbin/sendmail' // optional: defaults to php.ini path +- // ], +- +- /* +- * The envelope from address for outgoing emails. +- * This should be in a domain that has your application's IP addresses in its SPF record +- * to prevent it from being rejected by mail filters. +- */ +- //'sendmail_from' => 'no-reply@example.org', +- +- /* +- * The timezone of the server. This option should be set to the timezone you want +- * SimpleSAMLphp to report the time in. The default is to guess the timezone based +- * on your system timezone. +- * +- * See this page for a list of valid timezones: http://php.net/manual/en/timezones.php +- */ +- 'timezone' => null, +- +- +- +- /********************************** +- | SECURITY CONFIGURATION OPTIONS | +- **********************************/ +- +- /* +- * This is a secret salt used by SimpleSAMLphp when it needs to generate a secure hash +- * of a value. It must be changed from its default value to a secret value. The value of +- * 'secretsalt' can be any valid string of any length. +- * +- * A possible way to generate a random salt is by running the following command from a unix shell: +- * LC_CTYPE=C tr -c -d '0123456789abcdefghijklmnopqrstuvwxyz' /dev/null;echo +- */ +- 'secretsalt' => 'defaultsecretsalt', +- +- /* +- * This password must be kept secret, and modified from the default value 123. +- * This password will give access to the installation page of SimpleSAMLphp with +- * metadata listing and diagnostics pages. +- * You can also put a hash here; run "bin/pwgen.php" to generate one. +- */ +- 'auth.adminpassword' => '123', +- +- /* +- * Set this options to true if you want to require administrator password to access the web interface +- * or the metadata pages, respectively. +- */ +- 'admin.protectindexpage' => false, +- 'admin.protectmetadata' => false, +- +- /* +- * Set this option to false if you don't want SimpleSAMLphp to check for new stable releases when +- * visiting the configuration tab in the web interface. +- */ +- 'admin.checkforupdates' => true, +- +- /* +- * Array of domains that are allowed when generating links or redirects +- * to URLs. SimpleSAMLphp will use this option to determine whether to +- * to consider a given URL valid or not, but you should always validate +- * URLs obtained from the input on your own (i.e. ReturnTo or RelayState +- * parameters obtained from the $_REQUEST array). +- * +- * SimpleSAMLphp will automatically add your own domain (either by checking +- * it dynamically, or by using the domain defined in the 'baseurlpath' +- * directive, the latter having precedence) to the list of trusted domains, +- * in case this option is NOT set to NULL. In that case, you are explicitly +- * telling SimpleSAMLphp to verify URLs. +- * +- * Set to an empty array to disallow ALL redirects or links pointing to +- * an external URL other than your own domain. This is the default behaviour. +- * +- * Set to NULL to disable checking of URLs. DO NOT DO THIS UNLESS YOU KNOW +- * WHAT YOU ARE DOING! +- * +- * Example: +- * 'trusted.url.domains' => ['sp.example.com', 'app.example.com'], +- */ +- 'trusted.url.domains' => [], +- +- /* +- * Enable regular expression matching of trusted.url.domains. +- * +- * Set to true to treat the values in trusted.url.domains as regular +- * expressions. Set to false to do exact string matching. +- * +- * If enabled, the start and end delimiters ('^' and '$') will be added to +- * all regular expressions in trusted.url.domains. +- */ +- 'trusted.url.regex' => false, +- +- /* +- * Enable secure POST from HTTPS to HTTP. +- * +- * If you have some SP's on HTTP and IdP is normally on HTTPS, this option +- * enables secure POSTing to HTTP endpoint without warning from browser. +- * +- * For this to work, module.php/core/postredirect.php must be accessible +- * also via HTTP on IdP, e.g. if your IdP is on +- * https://idp.example.org/ssp/, then +- * http://idp.example.org/ssp/module.php/core/postredirect.php must be accessible. +- */ +- 'enable.http_post' => false, +- +- /* +- * Set the allowed clock skew between encrypting/decrypting assertions +- * +- * If you have an server that is constantly out of sync, this option +- * allows you to adjust the allowed clock-skew. +- * +- * Allowed range: 180 - 300 +- * Defaults to 180. +- */ +- 'assertion.allowed_clock_skew' => 180, +- +- +- /************************ +- | ERRORS AND DEBUGGING | +- ************************/ +- +- /* +- * The 'debug' option allows you to control how SimpleSAMLphp behaves in certain +- * situations where further action may be taken +- * +- * It can be left unset, in which case, debugging is switched off for all actions. +- * If set, it MUST be an array containing the actions that you want to enable, or +- * alternatively a hashed array where the keys are the actions and their +- * corresponding values are booleans enabling or disabling each particular action. +- * +- * SimpleSAMLphp provides some pre-defined actiones, though modules could add new +- * actions here. Refer to the documentation of every module to learn if they +- * allow you to set any more debugging actions. +- * +- * The pre-defined actions are: +- * +- * - 'saml': this action controls the logging of SAML messages exchanged with other +- * entities. When enabled ('saml' is present in this option, or set to true), all +- * SAML messages will be logged, including plaintext versions of encrypted +- * messages. +- * +- * - 'backtraces': this action controls the logging of error backtraces. If you +- * want to log backtraces so that you can debug any possible errors happening in +- * SimpleSAMLphp, enable this action (add it to the array or set it to true). +- * +- * - 'validatexml': this action allows you to validate SAML documents against all +- * the relevant XML schemas. SAML 1.1 messages or SAML metadata parsed with +- * the XML to SimpleSAMLphp metadata converter or the metaedit module will +- * validate the SAML documents if this option is enabled. +- * +- * If you want to disable debugging completely, unset this option or set it to an +- * empty array. +- */ +- 'debug' => [ +- 'saml' => false, +- 'backtraces' => true, +- 'validatexml' => false, +- ], +- +- /* +- * When 'showerrors' is enabled, all error messages and stack traces will be output +- * to the browser. +- * +- * When 'errorreporting' is enabled, a form will be presented for the user to report +- * the error to 'technicalcontact_email'. +- */ +- 'showerrors' => true, +- 'errorreporting' => true, +- +- /* +- * Custom error show function called from SimpleSAML\Error\Error::show. +- * See docs/simplesamlphp-errorhandling.txt for function code example. +- * +- * Example: +- * 'errors.show_function' => ['SimpleSAML\Module\example\Error', 'show'], +- */ +- +- +- +- /************************** +- | LOGGING AND STATISTICS | +- **************************/ +- +- /* +- * Define the minimum log level to log. Available levels: +- * - SimpleSAML\Logger::ERR No statistics, only errors +- * - SimpleSAML\Logger::WARNING No statistics, only warnings/errors +- * - SimpleSAML\Logger::NOTICE Statistics and errors +- * - SimpleSAML\Logger::INFO Verbose logs +- * - SimpleSAML\Logger::DEBUG Full debug logs - not recommended for production +- * +- * Choose logging handler. +- * +- * Options: [syslog,file,errorlog,stderr] +- * +- */ +- 'logging.level' => SimpleSAML\Logger::NOTICE, +- 'logging.handler' => 'syslog', +- +- /* +- * Specify the format of the logs. Its use varies depending on the log handler used (for instance, you cannot +- * control here how dates are displayed when using the syslog or errorlog handlers), but in general the options +- * are: +- * +- * - %date{}: the date and time, with its format specified inside the brackets. See the PHP documentation +- * of the strftime() function for more information on the format. If the brackets are omitted, the standard +- * format is applied. This can be useful if you just want to control the placement of the date, but don't care +- * about the format. +- * +- * - %process: the name of the SimpleSAMLphp process. Remember you can configure this in the 'logging.processname' +- * option below. +- * +- * - %level: the log level (name or number depending on the handler used). +- * +- * - %stat: if the log entry is intended for statistical purposes, it will print the string 'STAT ' (bear in mind +- * the trailing space). +- * +- * - %trackid: the track ID, an identifier that allows you to track a single session. +- * +- * - %srcip: the IP address of the client. If you are behind a proxy, make sure to modify the +- * $_SERVER['REMOTE_ADDR'] variable on your code accordingly to the X-Forwarded-For header. +- * +- * - %msg: the message to be logged. +- * +- */ +- //'logging.format' => '%date{%b %d %H:%M:%S} %process %level %stat[%trackid] %msg', +- +- /* +- * Choose which facility should be used when logging with syslog. +- * +- * These can be used for filtering the syslog output from SimpleSAMLphp into its +- * own file by configuring the syslog daemon. +- * +- * See the documentation for openlog (http://php.net/manual/en/function.openlog.php) for available +- * facilities. Note that only LOG_USER is valid on windows. +- * +- * The default is to use LOG_LOCAL5 if available, and fall back to LOG_USER if not. +- */ +- 'logging.facility' => defined('LOG_LOCAL5') ? constant('LOG_LOCAL5') : LOG_USER, +- +- /* +- * The process name that should be used when logging to syslog. +- * The value is also written out by the other logging handlers. +- */ +- 'logging.processname' => 'simplesamlphp', +- +- /* +- * Logging: file - Logfilename in the loggingdir from above. +- */ +- 'logging.logfile' => 'simplesamlphp.log', +- +- /* +- * This is an array of outputs. Each output has at least a 'class' option, which +- * selects the output. +- */ +- 'statistics.out' => [// Log statistics to the normal log. +- /* +- [ +- 'class' => 'core:Log', +- 'level' => 'notice', +- ], +- */ +- // Log statistics to files in a directory. One file per day. +- /* +- [ +- 'class' => 'core:File', +- 'directory' => '/var/log/stats', +- ], +- */ +- ], +- +- +- +- /*********************** +- | PROXY CONFIGURATION | +- ***********************/ +- +- /* +- * Proxy to use for retrieving URLs. +- * +- * Example: +- * 'proxy' => 'tcp://proxy.example.com:5100' +- */ +- 'proxy' => null, +- +- /* +- * Username/password authentication to proxy (Proxy-Authorization: Basic) +- * Example: +- * 'proxy.auth' = 'myuser:password' +- */ +- //'proxy.auth' => 'myuser:password', +- +- +- +- /************************** +- | DATABASE CONFIGURATION | +- **************************/ +- +- /* +- * This database configuration is optional. If you are not using +- * core functionality or modules that require a database, you can +- * skip this configuration. +- */ +- +- /* +- * Database connection string. +- * Ensure that you have the required PDO database driver installed +- * for your connection string. +- */ +- 'database.dsn' => 'mysql:host=localhost;dbname=saml', +- +- /* +- * SQL database credentials +- */ +- 'database.username' => 'simplesamlphp', +- 'database.password' => 'secret', +- 'database.options' => [], +- +- /* +- * (Optional) Table prefix +- */ +- 'database.prefix' => '', +- +- /* +- * (Optional) Driver options +- */ +- 'database.driver_options' => [], +- +- /* +- * True or false if you would like a persistent database connection +- */ +- 'database.persistent' => false, +- +- /* +- * Database slave configuration is optional as well. If you are only +- * running a single database server, leave this blank. If you have +- * a master/slave configuration, you can define as many slave servers +- * as you want here. Slaves will be picked at random to be queried from. +- * +- * Configuration options in the slave array are exactly the same as the +- * options for the master (shown above) with the exception of the table +- * prefix and driver options. +- */ +- 'database.slaves' => [ +- /* +- [ +- 'dsn' => 'mysql:host=myslave;dbname=saml', +- 'username' => 'simplesamlphp', +- 'password' => 'secret', +- 'persistent' => false, +- ], +- */ +- ], +- +- +- +- /************* +- | PROTOCOLS | +- *************/ +- +- /* +- * Which functionality in SimpleSAMLphp do you want to enable. Normally you would enable only +- * one of the functionalities below, but in some cases you could run multiple functionalities. +- * In example when you are setting up a federation bridge. +- */ +- 'enable.saml20-idp' => false, +- 'enable.shib13-idp' => false, +- 'enable.adfs-idp' => false, +- +- /* +- * Whether SimpleSAMLphp should sign the response or the assertion in SAML 1.1 authentication +- * responses. +- * +- * The default is to sign the assertion element, but that can be overridden by setting this +- * option to TRUE. It can also be overridden on a pr. SP basis by adding an option with the +- * same name to the metadata of the SP. +- */ +- 'shib13.signresponse' => true, +- +- +- +- /*********** +- | MODULES | +- ***********/ +- +- /* +- * Configuration to override module enabling/disabling. +- * +- * Example: +- * +- * 'module.enable' => [ +- * 'exampleauth' => true, // Setting to TRUE enables. +- * 'consent' => false, // Setting to FALSE disables. +- * 'core' => null, // Unset or NULL uses default. +- * ], +- * +- */ +- +- +- +- /************************* +- | SESSION CONFIGURATION | +- *************************/ +- +- /* +- * This value is the duration of the session in seconds. Make sure that the time duration of +- * cookies both at the SP and the IdP exceeds this duration. +- */ +- 'session.duration' => 8 * (60 * 60), // 8 hours. +- +- /* +- * Sets the duration, in seconds, data should be stored in the datastore. As the data store is used for +- * login and logout requests, this option will control the maximum time these operations can take. +- * The default is 4 hours (4*60*60) seconds, which should be more than enough for these operations. +- */ +- 'session.datastore.timeout' => (4 * 60 * 60), // 4 hours +- +- /* +- * Sets the duration, in seconds, auth state should be stored. +- */ +- 'session.state.timeout' => (60 * 60), // 1 hour +- +- /* +- * Option to override the default settings for the session cookie name +- */ +- 'session.cookie.name' => 'SimpleSAMLSessionID', +- +- /* +- * Expiration time for the session cookie, in seconds. +- * +- * Defaults to 0, which means that the cookie expires when the browser is closed. +- * +- * Example: +- * 'session.cookie.lifetime' => 30*60, +- */ +- 'session.cookie.lifetime' => 0, +- +- /* +- * Limit the path of the cookies. +- * +- * Can be used to limit the path of the cookies to a specific subdirectory. +- * +- * Example: +- * 'session.cookie.path' => '/simplesaml/', +- */ +- 'session.cookie.path' => '/', +- +- /* +- * Cookie domain. +- * +- * Can be used to make the session cookie available to several domains. +- * +- * Example: +- * 'session.cookie.domain' => '.example.org', +- */ +- 'session.cookie.domain' => null, +- +- /* +- * Set the secure flag in the cookie. +- * +- * Set this to TRUE if the user only accesses your service +- * through https. If the user can access the service through +- * both http and https, this must be set to FALSE. +- */ +- 'session.cookie.secure' => false, +- +- /* +- * Set the SameSite attribute in the cookie. +- * +- * You can set this to the strings 'None', 'Lax', or 'Strict' to support +- * the RFC6265bis SameSite cookie attribute. If set to null, no SameSite +- * attribute will be sent. +- * +- * Example: +- * 'session.cookie.samesite' => 'None', +- */ +- 'session.cookie.samesite' => null, +- +- /* +- * Options to override the default settings for php sessions. +- */ +- 'session.phpsession.cookiename' => 'SimpleSAML', +- 'session.phpsession.savepath' => null, +- 'session.phpsession.httponly' => true, +- +- /* +- * Option to override the default settings for the auth token cookie +- */ +- 'session.authtoken.cookiename' => 'SimpleSAMLAuthToken', +- +- /* +- * Options for remember me feature for IdP sessions. Remember me feature +- * has to be also implemented in authentication source used. +- * +- * Option 'session.cookie.lifetime' should be set to zero (0), i.e. cookie +- * expires on browser session if remember me is not checked. +- * +- * Session duration ('session.duration' option) should be set according to +- * 'session.rememberme.lifetime' option. +- * +- * It's advised to use remember me feature with session checking function +- * defined with 'session.check_function' option. +- */ +- 'session.rememberme.enable' => false, +- 'session.rememberme.checked' => false, +- 'session.rememberme.lifetime' => (14 * 86400), +- +- /* +- * Custom function for session checking called on session init and loading. +- * See docs/simplesamlphp-advancedfeatures.txt for function code example. +- * +- * Example: +- * 'session.check_function' => ['\SimpleSAML\Module\example\Util', 'checkSession'], +- */ +- +- +- +- /************************** +- | MEMCACHE CONFIGURATION | +- **************************/ +- +- /* +- * Configuration for the 'memcache' session store. This allows you to store +- * multiple redundant copies of sessions on different memcache servers. +- * +- * 'memcache_store.servers' is an array of server groups. Every data +- * item will be mirrored in every server group. +- * +- * Each server group is an array of servers. The data items will be +- * load-balanced between all servers in each server group. +- * +- * Each server is an array of parameters for the server. The following +- * options are available: +- * - 'hostname': This is the hostname or ip address where the +- * memcache server runs. This is the only required option. +- * - 'port': This is the port number of the memcache server. If this +- * option isn't set, then we will use the 'memcache.default_port' +- * ini setting. This is 11211 by default. +- * - 'weight': This sets the weight of this server in this server +- * group. http://php.net/manual/en/function.Memcache-addServer.php +- * contains more information about the weight option. +- * - 'timeout': The timeout for this server. By default, the timeout +- * is 3 seconds. +- * +- * Example of redundant configuration with load balancing: +- * This configuration makes it possible to lose both servers in the +- * a-group or both servers in the b-group without losing any sessions. +- * Note that sessions will be lost if one server is lost from both the +- * a-group and the b-group. +- * +- * 'memcache_store.servers' => [ +- * [ +- * ['hostname' => 'mc_a1'], +- * ['hostname' => 'mc_a2'], +- * ], +- * [ +- * ['hostname' => 'mc_b1'], +- * ['hostname' => 'mc_b2'], +- * ], +- * ], +- * +- * Example of simple configuration with only one memcache server, +- * running on the same computer as the web server: +- * Note that all sessions will be lost if the memcache server crashes. +- * +- * 'memcache_store.servers' => [ +- * [ +- * ['hostname' => 'localhost'], +- * ], +- * ], +- * +- */ +- 'memcache_store.servers' => [ +- [ +- ['hostname' => 'localhost'], +- ], +- ], +- +- /* +- * This value allows you to set a prefix for memcache-keys. The default +- * for this value is 'simpleSAMLphp', which is fine in most cases. +- * +- * When running multiple instances of SSP on the same host, and more +- * than one instance is using memcache, you probably want to assign +- * a unique value per instance to this setting to avoid data collision. +- */ +- 'memcache_store.prefix' => '', +- +- /* +- * This value is the duration data should be stored in memcache. Data +- * will be dropped from the memcache servers when this time expires. +- * The time will be reset every time the data is written to the +- * memcache servers. +- * +- * This value should always be larger than the 'session.duration' +- * option. Not doing this may result in the session being deleted from +- * the memcache servers while it is still in use. +- * +- * Set this value to 0 if you don't want data to expire. +- * +- * Note: The oldest data will always be deleted if the memcache server +- * runs out of storage space. +- */ +- 'memcache_store.expires' => 36 * (60 * 60), // 36 hours. +- +- +- +- /************************************* +- | LANGUAGE AND INTERNATIONALIZATION | +- *************************************/ +- +- /* +- * Language-related options. +- */ +- 'language' => [ +- /* +- * An array in the form 'language' => . +- * +- * Each key in the array is the ISO 639 two-letter code for a language, +- * and its value is an array with a list of alternative languages that +- * can be used if the given language is not available at some point. +- * Each alternative language is also specified by its ISO 639 code. +- * +- * For example, for the "no" language code (Norwegian), we would have: +- * +- * 'priorities' => [ +- * 'no' => ['nb', 'nn', 'en', 'se'], +- * ... +- * ], +- * +- * establishing that if a translation for the "no" language code is +- * not available, we look for translations in "nb" (Norwegian Bokmål), +- * and so on, in that order. +- */ +- 'priorities' => [ +- 'no' => ['nb', 'nn', 'en', 'se'], +- 'nb' => ['no', 'nn', 'en', 'se'], +- 'nn' => ['no', 'nb', 'en', 'se'], +- 'se' => ['nb', 'no', 'nn', 'en'], +- 'nr' => ['zu', 'en'], +- 'nd' => ['zu', 'en'], +- ], +- ], +- +- /* +- * Languages available, RTL languages, and what language is the default. +- */ +- 'language.available' => [ +- 'en', 'no', 'nn', 'se', 'da', 'de', 'sv', 'fi', 'es', 'ca', 'fr', 'it', 'nl', 'lb', +- 'cs', 'sl', 'lt', 'hr', 'hu', 'pl', 'pt', 'pt-br', 'tr', 'ja', 'zh', 'zh-tw', 'ru', +- 'et', 'he', 'id', 'sr', 'lv', 'ro', 'eu', 'el', 'af', 'zu', 'xh', +- ], +- 'language.rtl' => ['ar', 'dv', 'fa', 'ur', 'he'], +- 'language.default' => 'en', +- +- /* +- * Options to override the default settings for the language parameter +- */ +- 'language.parameter.name' => 'language', +- 'language.parameter.setcookie' => true, +- +- /* +- * Options to override the default settings for the language cookie +- */ +- 'language.cookie.name' => 'language', +- 'language.cookie.domain' => null, +- 'language.cookie.path' => '/', +- 'language.cookie.secure' => false, +- 'language.cookie.httponly' => false, +- 'language.cookie.lifetime' => (60 * 60 * 24 * 900), +- 'language.cookie.samesite' => null, +- +- /** +- * Custom getLanguage function called from SimpleSAML\Locale\Language::getLanguage(). +- * Function should return language code of one of the available languages or NULL. +- * See SimpleSAML\Locale\Language::getLanguage() source code for more info. +- * +- * This option can be used to implement a custom function for determining +- * the default language for the user. +- * +- * Example: +- * 'language.get_language_function' => ['\SimpleSAML\Module\example\Template', 'getLanguage'], +- */ +- +- /* +- * Extra dictionary for attribute names. +- * This can be used to define local attributes. +- * +- * The format of the parameter is a string with :. +- * +- * Specifying this option will cause us to look for modules//dictionaries/.definition.json +- * The dictionary should look something like: +- * +- * { +- * "firstattribute": { +- * "en": "English name", +- * "no": "Norwegian name" +- * }, +- * "secondattribute": { +- * "en": "English name", +- * "no": "Norwegian name" +- * } +- * } +- * +- * Note that all attribute names in the dictionary must in lowercase. +- * +- * Example: 'attributes.extradictionary' => 'ourmodule:ourattributes', +- */ +- 'attributes.extradictionary' => null, +- +- +- +- /************** +- | APPEARANCE | +- **************/ +- +- /* +- * Which theme directory should be used? +- */ +- 'theme.use' => 'default', +- +- /* +- * Set this option to the text you would like to appear at the header of each page. Set to false if you don't want +- * any text to appear in the header. +- */ +- //'theme.header' => 'SimpleSAMLphp' +- +- /** +- * A template controller, if any. +- * +- * Used to intercept certain parts of the template handling, while keeping away unwanted/unexpected hooks. Set +- * the 'theme.controller' configuration option to a class that implements the +- * \SimpleSAML\XHTML\TemplateControllerInterface interface to use it. +- */ +- //'theme.controller' => '', +- +- /* +- * Templating options +- * +- * By default, twig templates are not cached. To turn on template caching: +- * Set 'template.cache' to an absolute path pointing to a directory that +- * SimpleSAMLphp has read and write permissions to. +- */ +- //'template.cache' => '', +- +- /* +- * Set the 'template.auto_reload' to true if you would like SimpleSAMLphp to +- * recompile the templates (when using the template cache) if the templates +- * change. If you don't want to check the source templates for every request, +- * set it to false. +- */ +- 'template.auto_reload' => false, +- +- /* +- * Set this option to true to indicate that your installation of SimpleSAMLphp +- * is running in a production environment. This will affect the way resources +- * are used, offering an optimized version when running in production, and an +- * easy-to-debug one when not. Set it to false when you are testing or +- * developing the software, in which case a banner will be displayed to remind +- * users that they're dealing with a non-production instance. +- * +- * Defaults to true. +- */ +- 'production' => true, +- +- /* +- * SimpleSAMLphp modules can host static resources which are served through PHP. +- * The serving of the resources can be configured through these settings. +- */ +- 'assets' => [ +- /* +- * These settings adjust the caching headers that are sent +- * when serving static resources. +- */ +- 'caching' => [ +- /* +- * Amount of seconds before the resource should be fetched again +- */ +- 'max_age' => 86400, +- /* +- * Calculate a checksum of every file and send it to the browser +- * This allows the browser to avoid downloading assets again in situations +- * where the Last-Modified header cannot be trusted, +- * for example in cluster setups +- * +- * Defaults false +- */ +- 'etag' => false, +- ], +- ], +- +- +- /********************* +- | DISCOVERY SERVICE | +- *********************/ +- +- /* +- * Whether the discovery service should allow the user to save his choice of IdP. +- */ +- 'idpdisco.enableremember' => true, +- 'idpdisco.rememberchecked' => true, +- +- /* +- * The disco service only accepts entities it knows. +- */ +- 'idpdisco.validate' => true, +- +- 'idpdisco.extDiscoveryStorage' => null, +- +- /* +- * IdP Discovery service look configuration. +- * Wether to display a list of idp or to display a dropdown box. For many IdP' a dropdown box +- * gives the best use experience. +- * +- * When using dropdown box a cookie is used to highlight the previously chosen IdP in the dropdown. +- * This makes it easier for the user to choose the IdP +- * +- * Options: [links,dropdown] +- */ +- 'idpdisco.layout' => 'dropdown', +- +- +- +- /************************************* +- | AUTHENTICATION PROCESSING FILTERS | +- *************************************/ +- +- /* +- * Authentication processing filters that will be executed for all IdPs +- * Both Shibboleth and SAML 2.0 +- */ +- 'authproc.idp' => [ +- /* Enable the authproc filter below to add URN prefixes to all attributes +- 10 => array[ +- 'class' => 'core:AttributeMap', 'addurnprefix' +- ], +- */ +- /* Enable the authproc filter below to automatically generated eduPersonTargetedID. +- 20 => 'core:TargetedID', +- */ +- +- // Adopts language from attribute to use in UI +- 30 => 'core:LanguageAdaptor', +- +- 45 => [ +- 'class' => 'core:StatisticsWithAttribute', +- 'attributename' => 'realm', +- 'type' => 'saml20-idp-SSO', +- ], +- +- /* When called without parameters, it will fallback to filter attributes ‹the old way› +- * by checking the 'attributes' parameter in metadata on IdP hosted and SP remote. +- */ +- 50 => 'core:AttributeLimit', +- +- /* +- * Search attribute "distinguishedName" for pattern and replaces if found +- */ +- /* +- 60 => [ +- 'class' => 'core:AttributeAlter', +- 'pattern' => '/OU=studerende/', +- 'replacement' => 'Student', +- 'subject' => 'distinguishedName', +- '%replace', +- ], +- */ +- +- /* +- * Consent module is enabled (with no permanent storage, using cookies). +- */ +- /* +- 90 => [ +- 'class' => 'consent:Consent', +- 'store' => 'consent:Cookie', +- 'focus' => 'yes', +- 'checked' => true +- ], +- */ +- // If language is set in Consent module it will be added as an attribute. +- 99 => 'core:LanguageAdaptor', +- ], +- +- /* +- * Authentication processing filters that will be executed for all SPs +- * Both Shibboleth and SAML 2.0 +- */ +- 'authproc.sp' => [ +- /* +- 10 => [ +- 'class' => 'core:AttributeMap', 'removeurnprefix' +- ], +- */ +- +- /* +- * Generate the 'group' attribute populated from other variables, including eduPersonAffiliation. +- 60 => [ +- 'class' => 'core:GenerateGroups', 'eduPersonAffiliation' +- ], +- */ +- /* +- * All users will be members of 'users' and 'members' +- */ +- /* +- 61 => [ +- 'class' => 'core:AttributeAdd', 'groups' => ['users', 'members'] +- ], +- */ +- +- // Adopts language from attribute to use in UI +- 90 => 'core:LanguageAdaptor', +- ], +- +- +- +- /************************** +- | METADATA CONFIGURATION | +- **************************/ +- +- /* +- * This option allows you to specify a directory for your metadata outside of the standard metadata directory +- * included in the standard distribution of the software. +- */ +- 'metadatadir' => 'metadata', +- +- /* +- * This option configures the metadata sources. The metadata sources is given as an array with +- * different metadata sources. When searching for metadata, SimpleSAMLphp will search through +- * the array from start to end. +- * +- * Each element in the array is an associative array which configures the metadata source. +- * The type of the metadata source is given by the 'type' element. For each type we have +- * different configuration options. +- * +- * Flat file metadata handler: +- * - 'type': This is always 'flatfile'. +- * - 'directory': The directory we will load the metadata files from. The default value for +- * this option is the value of the 'metadatadir' configuration option, or +- * 'metadata/' if that option is unset. +- * +- * XML metadata handler: +- * This metadata handler parses an XML file with either an EntityDescriptor element or an +- * EntitiesDescriptor element. The XML file may be stored locally, or (for debugging) on a remote +- * web server. +- * The XML metadata handler defines the following options: +- * - 'type': This is always 'xml'. +- * - 'file': Path to the XML file with the metadata. +- * - 'url': The URL to fetch metadata from. THIS IS ONLY FOR DEBUGGING - THERE IS NO CACHING OF THE RESPONSE. +- * +- * MDQ metadata handler: +- * This metadata handler looks up for the metadata of an entity at the given MDQ server. +- * The MDQ metadata handler defines the following options: +- * - 'type': This is always 'mdq'. +- * - 'server': Base URL of the MDQ server. Mandatory. +- * - 'validateFingerprint': The fingerprint of the certificate used to sign the metadata. You don't need this +- * option if you don't want to validate the signature on the metadata. Optional. +- * - 'cachedir': Directory where metadata can be cached. Optional. +- * - 'cachelength': Maximum time metadata can be cached, in seconds. Defaults to 24 +- * hours (86400 seconds). Optional. +- * +- * PDO metadata handler: +- * This metadata handler looks up metadata of an entity stored in a database. +- * +- * Note: If you are using the PDO metadata handler, you must configure the database +- * options in this configuration file. +- * +- * The PDO metadata handler defines the following options: +- * - 'type': This is always 'pdo'. +- * +- * Examples: +- * +- * This example defines two flatfile sources. One is the default metadata directory, the other +- * is a metadata directory with auto-generated metadata files. +- * +- * 'metadata.sources' => [ +- * ['type' => 'flatfile'], +- * ['type' => 'flatfile', 'directory' => 'metadata-generated'], +- * ], +- * +- * This example defines a flatfile source and an XML source. +- * 'metadata.sources' => [ +- * ['type' => 'flatfile'], +- * ['type' => 'xml', 'file' => 'idp.example.org-idpMeta.xml'], +- * ], +- * +- * This example defines an mdq source. +- * 'metadata.sources' => [ +- * [ +- * 'type' => 'mdq', +- * 'server' => 'http://mdq.server.com:8080', +- * 'cachedir' => '/var/simplesamlphp/mdq-cache', +- * 'cachelength' => 86400 +- * ] +- * ], +- * +- * This example defines an pdo source. +- * 'metadata.sources' => [ +- * ['type' => 'pdo'] +- * ], +- * +- * Default: +- * 'metadata.sources' => [ +- * ['type' => 'flatfile'] +- * ], +- */ +- 'metadata.sources' => [ +- ['type' => 'flatfile'], +- ], +- +- /* +- * Should signing of generated metadata be enabled by default. +- * +- * Metadata signing can also be enabled for a individual SP or IdP by setting the +- * same option in the metadata for the SP or IdP. +- */ +- 'metadata.sign.enable' => false, +- +- /* +- * The default key & certificate which should be used to sign generated metadata. These +- * are files stored in the cert dir. +- * These values can be overridden by the options with the same names in the SP or +- * IdP metadata. +- * +- * If these aren't specified here or in the metadata for the SP or IdP, then +- * the 'certificate' and 'privatekey' option in the metadata will be used. +- * if those aren't set, signing of metadata will fail. +- */ +- 'metadata.sign.privatekey' => null, +- 'metadata.sign.privatekey_pass' => null, +- 'metadata.sign.certificate' => null, +- 'metadata.sign.algorithm' => null, +- +- +- /**************************** +- | DATA STORE CONFIGURATION | +- ****************************/ +- +- /* +- * Configure the data store for SimpleSAMLphp. +- * +- * - 'phpsession': Limited datastore, which uses the PHP session. +- * - 'memcache': Key-value datastore, based on memcache. +- * - 'sql': SQL datastore, using PDO. +- * - 'redis': Key-value datastore, based on redis. +- * +- * The default datastore is 'phpsession'. +- */ +- 'store.type' => 'phpsession', +- +- /* +- * The DSN the sql datastore should connect to. +- * +- * See http://www.php.net/manual/en/pdo.drivers.php for the various +- * syntaxes. +- */ +- 'store.sql.dsn' => 'sqlite:/path/to/sqlitedatabase.sq3', +- +- /* +- * The username and password to use when connecting to the database. +- */ +- 'store.sql.username' => null, +- 'store.sql.password' => null, +- +- /* +- * The prefix we should use on our tables. +- */ +- 'store.sql.prefix' => 'SimpleSAMLphp', +- +- /* +- * The hostname and port of the Redis datastore instance. +- */ +- 'store.redis.host' => 'localhost', +- 'store.redis.port' => 6379, +- +- /* +- * The prefix we should use on our Redis datastore. +- */ +- 'store.redis.prefix' => 'SimpleSAMLphp', +-]; +diff --git a/metadata/adfs-idp-hosted.php b/metadata/adfs-idp-hosted.php +deleted file mode 100644 +index dd8134069..000000000 +--- a/metadata/adfs-idp-hosted.php ++++ /dev/null +@@ -1,12 +0,0 @@ +- '__DEFAULT__', +- 'privatekey' => 'server.pem', +- 'certificate' => 'server.crt', +- 'auth' => 'example-userpass', +- 'authproc' => [ +- // Convert LDAP names to WS-Fed Claims. +- 100 => ['class' => 'core:AttributeMap', 'name2claim'], +- ], +-]; +diff --git a/metadata/adfs-sp-remote.php b/metadata/adfs-sp-remote.php +deleted file mode 100644 +index ec2d79c91..000000000 +--- a/metadata/adfs-sp-remote.php ++++ /dev/null +@@ -1,12 +0,0 @@ +- 'https://localhost/adfs/ls/', +- 'simplesaml.nameidattribute' => 'uid', +- 'authproc' => [ +- 50 => [ +- 'class' => 'core:AttributeLimit', +- 'cn', 'mail', 'uid', 'eduPersonAffiliation', +- ], +- ], +-]; +diff --git a/metadata/saml20-idp-hosted.php b/metadata/saml20-idp-hosted.php +deleted file mode 100644 +index 79dc926d6..000000000 +--- a/metadata/saml20-idp-hosted.php ++++ /dev/null +@@ -1,52 +0,0 @@ +- '__DEFAULT__', +- +- // X.509 key and certificate. Relative to the cert directory. +- 'privatekey' => 'server.pem', +- 'certificate' => 'server.crt', +- +- /* +- * Authentication source to use. Must be one that is configured in +- * 'config/authsources.php'. +- */ +- 'auth' => 'example-userpass', +- +- /* Uncomment the following to use the uri NameFormat on attributes. */ +- /* +- 'attributes.NameFormat' => 'urn:oasis:names:tc:SAML:2.0:attrname-format:uri', +- 'authproc' => [ +- // Convert LDAP names to oids. +- 100 => ['class' => 'core:AttributeMap', 'name2oid'], +- ], +- */ +- +- /* +- * Uncomment the following to specify the registration information in the +- * exported metadata. Refer to: +- * http://docs.oasis-open.org/security/saml/Post2.0/saml-metadata-rpi/v1.0/cs01/saml-metadata-rpi-v1.0-cs01.html +- * for more information. +- */ +- /* +- 'RegistrationInfo' => [ +- 'authority' => 'urn:mace:example.org', +- 'instant' => '2008-01-17T11:28:03Z', +- 'policies' => [ +- 'en' => 'http://example.org/policy', +- 'es' => 'http://example.org/politica', +- ], +- ], +- */ +-]; +diff --git a/metadata/saml20-idp-remote.php b/metadata/saml20-idp-remote.php +deleted file mode 100644 +index 264e8bcdb..000000000 +--- a/metadata/saml20-idp-remote.php ++++ /dev/null +@@ -1,9 +0,0 @@ +- 'https://saml2sp.example.org/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp', +- 'SingleLogoutService' => 'https://saml2sp.example.org/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp', +-]; +- +-/* +- * This example shows an example config that works with G Suite (Google Apps) for education. +- * What is important is that you have an attribute in your IdP that maps to the local part of the email address at +- * G Suite. In example, if your Google account is foo.com, and you have a user that has an email john@foo.com, then you +- * must set the simplesaml.nameidattribute to be the name of an attribute that for this user has the value of 'john'. +- */ +-$metadata['google.com'] = [ +- 'AssertionConsumerService' => 'https://www.google.com/a/g.feide.no/acs', +- 'NameIDFormat' => 'urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress', +- 'simplesaml.nameidattribute' => 'uid', +- 'simplesaml.attributes' => false, +-]; +- +-$metadata['https://legacy.example.edu'] = [ +- 'AssertionConsumerService' => 'https://legacy.example.edu/saml/acs', +- /* +- * Currently, SimpleSAMLphp defaults to the SHA-256 hashing algorithm. +- * Uncomment the following option to use SHA-1 for signatures directed +- * at this specific service provider if it does not support SHA-256 yet. +- * +- * WARNING: SHA-1 is disallowed starting January the 1st, 2014. +- * Please refer to the following document for more information: +- * http://csrc.nist.gov/publications/nistpubs/800-131A/sp800-131A.pdf +- */ +- //'signature.algorithm' => 'http://www.w3.org/2000/09/xmldsig#rsa-sha1', +-]; +diff --git a/metadata/shib13-idp-hosted.php b/metadata/shib13-idp-hosted.php +deleted file mode 100644 +index dc6c9e0a9..000000000 +--- a/metadata/shib13-idp-hosted.php ++++ /dev/null +@@ -1,26 +0,0 @@ +- '__DEFAULT__', +- +- // X.509 key and certificate. Relative to the cert directory. +- 'privatekey' => 'server.pem', +- 'certificate' => 'server.crt', +- +- /* +- * Authentication source to use. Must be one that is configured in +- * 'config/authsources.php'. +- */ +- 'auth' => 'example-userpass', +-]; +diff --git a/metadata/shib13-idp-remote.php b/metadata/shib13-idp-remote.php +deleted file mode 100644 +index 9aa6f0e64..000000000 +--- a/metadata/shib13-idp-remote.php ++++ /dev/null +@@ -1,16 +0,0 @@ +- 'https://idp.example.org/shibboleth-idp/SSO', +- 'certificate' => 'example.pem', +-]; +-*/ +diff --git a/metadata/shib13-sp-hosted.php b/metadata/shib13-sp-hosted.php +deleted file mode 100644 +index 15a275a38..000000000 +--- a/metadata/shib13-sp-hosted.php ++++ /dev/null +@@ -1,14 +0,0 @@ +- '__DEFAULT__', +-]; +diff --git a/metadata/shib13-sp-remote.php b/metadata/shib13-sp-remote.php +deleted file mode 100644 +index b2fb1d8e0..000000000 +--- a/metadata/shib13-sp-remote.php ++++ /dev/null +@@ -1,16 +0,0 @@ +- 'http://sp.shiblab.feide.no/Shibboleth.sso/SAML/POST', +- 'audience' => 'urn:mace:feide:shiblab', +- 'base64attributes' => false, +-]; +diff --git a/metadata/wsfed-idp-remote.php b/metadata/wsfed-idp-remote.php +deleted file mode 100644 +index 05732c664..000000000 +--- a/metadata/wsfed-idp-remote.php ++++ /dev/null +@@ -1,10 +0,0 @@ +- 'https://localhost:9031/idp/prp.wsf', +- 'certificate' => 'pingfed-localhost.pem', +-]; +diff --git a/metadata/wsfed-sp-hosted.php b/metadata/wsfed-sp-hosted.php +deleted file mode 100644 +index bb123b941..000000000 +--- a/metadata/wsfed-sp-hosted.php ++++ /dev/null +@@ -1,12 +0,0 @@ +- '__DEFAULT__', +-]; diff --git a/patches/simplesamlphp-1.18_saml_metadata_attributes.patch b/patches/simplesamlphp-1.18_saml_metadata_attributes.patch new file mode 100644 index 0000000..af58220 --- /dev/null +++ b/patches/simplesamlphp-1.18_saml_metadata_attributes.patch @@ -0,0 +1,21 @@ +diff --git a/lib/SimpleSAML/Metadata/SAMLBuilder.php b/lib/SimpleSAML/Metadata/SAMLBuilder.php +index 0752591be..918c934ae 100644 +--- a/lib/SimpleSAML/Metadata/SAMLBuilder.php ++++ b/lib/SimpleSAML/Metadata/SAMLBuilder.php +@@ -389,6 +389,7 @@ class SAMLBuilder + } + + $t->setIndex($ep['index']); ++ $t->setIsDefault($ep['isDefault'] ?? NULL); + } else { + $t = new EndpointType(); + } +@@ -462,6 +463,9 @@ class SAMLBuilder + if (in_array($attribute, $attributesrequired, true)) { + $t->setIsRequired(true); + } ++ else { ++ $t->setIsRequired(false); ++ } + $attributeconsumer->addRequestedAttribute($t); + } diff --git a/patches/simplesamlphp-saml_metadata_attributes.patch b/patches/simplesamlphp-saml_metadata_attributes.patch deleted file mode 100644 index 9ea63a9..0000000 --- a/patches/simplesamlphp-saml_metadata_attributes.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff --git a/lib/SimpleSAML/Metadata/SAMLBuilder.php b/lib/SimpleSAML/Metadata/SAMLBuilder.php -index 929cb5ebf..8f3b8184b 100644 ---- a/lib/SimpleSAML/Metadata/SAMLBuilder.php -+++ b/lib/SimpleSAML/Metadata/SAMLBuilder.php -@@ -343,6 +343,7 @@ class SAMLBuilder - - $t->setBinding($ep['Binding']); - $t->setLocation($ep['Location']); -+ $t->setIsDefault($ep['isDefault'] ?? NULL); - if (isset($ep['ResponseLocation'])) { - $t->setResponseLocation($ep['ResponseLocation']); - } -@@ -429,6 +430,9 @@ class SAMLBuilder - if (in_array($attribute, $attributesrequired, true)) { - $t->setIsRequired(true); - } -+ else { -+ $t->setIsRequired(false); -+ } - $attributeconsumer->addRequestedAttribute($t); - } - -diff --git a/modules/saml/www/sp/metadata.php b/modules/saml/www/sp/metadata.php -index 1289d31e9..70bb4ef20 100644 ---- a/modules/saml/www/sp/metadata.php -+++ b/modules/saml/www/sp/metadata.php -@@ -63,7 +63,7 @@ $index = 0; - $eps = []; - $supported_protocols = []; - foreach ($assertionsconsumerservices as $services) { -- $acsArray = ['index' => $index]; -+ $acsArray = ['index' => $index, 'isDefault' => FALSE]; - switch ($services) { - case 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST': - $acsArray['Binding'] = \SAML2\Constants::BINDING_HTTP_POST; -@@ -106,6 +106,8 @@ foreach ($assertionsconsumerservices as $services) { - $index++; - } - -+// Force the first service entry as the default. -+$eps[0]['isDefault'] = TRUE; - $metaArray20['AssertionConsumerService'] = $eps; - - $keys = [];