diff --git a/README.md b/README.md
index d1e2a526a..a99387226 100644
--- a/README.md
+++ b/README.md
@@ -19,3 +19,4 @@ DDev and Docker can be used to spin up this project.
* [Issue queue](https://github.com/usdoj/foia-api/issues)
* [GitHub](https://github.com/usdoj/foia-api)
+
diff --git a/composer.lock b/composer.lock
index 1f5c608e3..918add1ee 100644
--- a/composer.lock
+++ b/composer.lock
@@ -3255,27 +3255,26 @@
},
{
"name": "drupal/autologout",
- "version": "2.0.1",
+ "version": "2.0.2",
"source": {
"type": "git",
"url": "https://git.drupalcode.org/project/autologout.git",
- "reference": "2.0.1"
+ "reference": "2.0.2"
},
"dist": {
"type": "zip",
- "url": "https://ftp.drupal.org/files/projects/autologout-2.0.1.zip",
- "reference": "2.0.1",
- "shasum": "61407ffa8b857b1e5d22d03ededac94b5119bd60"
+ "url": "https://ftp.drupal.org/files/projects/autologout-2.0.2.zip",
+ "reference": "2.0.2",
+ "shasum": "5e9bb2b37368cdb5e5d09f27ac4018466aaac2d6"
},
"require": {
- "drupal/core": "^9.2 || ^10 || ^11",
- "drupal/js_cookie": "^1.0"
+ "drupal/core": "^9.2 || ^10 || ^11"
},
"type": "drupal-module",
"extra": {
"drupal": {
- "version": "2.0.1",
- "datestamp": "1732235105",
+ "version": "2.0.2",
+ "datestamp": "1773850192",
"security-coverage": {
"status": "covered",
"message": "Covered by Drupal's security advisory policy"
@@ -3331,10 +3330,6 @@
"name": "prabeen.giri",
"homepage": "https://www.drupal.org/user/913078"
},
- {
- "name": "scott_earnest",
- "homepage": "https://www.drupal.org/user/416158"
- },
{
"name": "str8",
"homepage": "https://www.drupal.org/user/2865063"
diff --git a/config/default/autologout.settings.yml b/config/default/autologout.settings.yml
index 3e073e80b..aee64dc38 100644
--- a/config/default/autologout.settings.yml
+++ b/config/default/autologout.settings.yml
@@ -5,9 +5,12 @@ enabled: true
timeout: 900
max_timeout: 900
padding: 20
+logout_regardless_of_activity: false
no_individual_logout_threshold: false
role_logout: false
+role_logout_max: false
redirect_url: /user/login
+include_destination: false
no_dialog: false
message: 'Your session is about to expire. Do you want to reset it?'
inactivity_message: 'You have been logged out due to inactivity.'
@@ -19,4 +22,9 @@ jstimer_js_load_option: false
use_alt_logout_method: false
use_watchdog: true
dialog_title: 'National FOIA Portal Alert'
+disable_buttons: false
+yes_button: ''
+no_button: ''
whitelisted_ip_addresses: ''
+cookie_secure: false
+cookie_httponly: false
diff --git a/config/default/samlauth.authentication.yml b/config/default/samlauth.authentication.yml
index f8e963714..83a0fed3e 100644
--- a/config/default/samlauth.authentication.yml
+++ b/config/default/samlauth.authentication.yml
@@ -2,64 +2,36 @@ _core:
default_config_hash: oDGEkhP0h5rXXqlDplxeBDre0goLigOJupHKMDMwcqM
login_menu_item_title: ''
logout_menu_item_title: ''
-login_link_show: true
-login_link_title: 'Login via MAX.gov'
+login_link_title: 'Login via FedHub'
+login_auto_redirect: false
login_redirect_url: ''
logout_redirect_url: ''
error_redirect_url: ''
error_throw: false
+login_error_keep_session: false
local_login_saml_error: false
logout_different_user: false
-drupal_login_roles:
- authenticated: '0'
- administrator: '0'
- page_creator: '0'
- layout_manager: '0'
- page_reviewer: '0'
- landing_page_creator: '0'
- landing_page_reviewer: '0'
- media_creator: '0'
- media_manager: '0'
- agency_component_creator: '0'
- agency_component_reviewer: '0'
- agency_administrator: '0'
- agency_manager: '0'
- non_sso: '0'
- quarterly_foia_report_data_creator: '0'
- quarterly_foia_report_data_reviewer: '0'
- cfo_meeting_creator: '0'
- cfo_meeting_reviewer: '0'
- cfo_committee_creator: '0'
- cfo_committee_reviewer: '0'
- cfo_council_creator: '0'
- cfo_council_reviewer: '0'
- cfo_page_creator: '0'
- cfo_page_reviewer: '0'
+drupal_login_roles: { }
sp_entity_id: doj_foia_api_dev
-sp_name_id_format: ''
sp_x509_certificate: 'file:/var/www/html/foia.dev/acquia-files/saml/samlauth_key.pub'
sp_new_certificate: ''
sp_private_key: 'file:/var/www/html/foia.dev/acquia-files/saml/samlauth_key'
metadata_valid_secs: 172800
metadata_cache_http: false
-idp_entity_id: 'https://login.test.max.gov/idp/shibboleth'
-idp_single_sign_on_service: 'https://login.test.max.gov/idp/profile/SAML2/Redirect/SSO'
+idp_entity_id: 'https://int.fedhub.hhs.gov/ABaaS/idp'
+idp_single_sign_on_service: 'https://int.fedhub.hhs.gov/ABaaS/idp'
idp_single_log_out_service: ''
idp_change_password_service: ''
idp_certs:
- - 'file:/var/www/html/foia.dev/acquia-files/saml/max_key.pub'
+ - 'file:/var/www/html/foia.dev/acquia-files/saml/fedhub_key.pub'
idp_cert_encryption: ''
-unique_id_attribute: maxEmail
+unique_id_attribute: email
map_users: false
map_users_name: true
map_users_mail: true
map_users_roles:
administrator: administrator
- page_creator: page_creator
layout_manager: layout_manager
- page_reviewer: page_reviewer
- landing_page_creator: landing_page_creator
- landing_page_reviewer: landing_page_reviewer
media_creator: media_creator
media_manager: media_manager
agency_component_creator: agency_component_creator
@@ -80,8 +52,8 @@ map_users_roles:
create_users: false
sync_name: true
sync_mail: true
-user_name_attribute: maxEmail
-user_mail_attribute: maxEmail
+user_name_attribute: email
+user_mail_attribute: email
request_set_name_id_policy: false
strict: true
security_metadata_sign: false
@@ -91,7 +63,7 @@ security_logout_responses_sign: false
security_nameid_encrypt: false
security_signature_algorithm: ''
security_encryption_algorithm: ''
-security_messages_sign: true
+security_messages_sign: false
security_assertions_signed: false
security_assertions_encrypt: false
security_nameid_encrypted: false
@@ -108,3 +80,4 @@ debug_phpsaml: false
use_proxy_headers: false
use_base_url: true
bypass_relay_state_check: false
+login_link_show: true
diff --git a/config/default/views.view.annual_foia_report_data_content_1.yml b/config/default/views.view.annual_foia_report_data_content_1.yml
index 9059b19a5..d0a54fedc 100644
--- a/config/default/views.view.annual_foia_report_data_content_1.yml
+++ b/config/default/views.view.annual_foia_report_data_content_1.yml
@@ -369,7 +369,7 @@ display:
admin_label: ''
entity_type: node
plugin_id: entity_link_edit
- label: Action
+ label: Edit
exclude: false
alter:
alter_text: false
@@ -413,6 +413,59 @@ display:
text: Edit
output_url_as_text: false
absolute: false
+ edit_node_1:
+ id: edit_node_1
+ table: node
+ field: edit_node
+ relationship: reverse__node__field_agency
+ group_type: group
+ admin_label: ''
+ entity_type: node
+ plugin_id: entity_link_edit
+ label: 'Edit by section'
+ exclude: false
+ alter:
+ alter_text: true
+ text: 'Edit by section'
+ make_link: false
+ path: ''
+ absolute: false
+ external: false
+ replace_spaces: false
+ path_case: none
+ trim_whitespace: false
+ alt: ''
+ rel: ''
+ link_class: ''
+ prefix: ''
+ suffix: ''
+ target: ''
+ nl2br: false
+ max_length: 0
+ word_boundary: true
+ ellipsis: true
+ more_link: false
+ more_link_text: ''
+ more_link_path: ''
+ strip_tags: false
+ trim: false
+ preserve_tags: ''
+ html: false
+ element_type: ''
+ element_class: ''
+ element_label_type: ''
+ element_label_class: ''
+ element_label_colon: true
+ element_wrapper_type: ''
+ element_wrapper_class: ''
+ element_default_classes: true
+ empty: ''
+ hide_empty: false
+ empty_zero: false
+ hide_alter_empty: true
+ text: 'Edit by section'
+ output_url_as_text: true
+ absolute: false
field_agency:
id: field_agency
table: user__field_agency
diff --git a/config/default/webform.webform.hhs_fda_form.yml b/config/default/webform.webform.hhs_fda_form.yml
index 70b49f764..54cb1b8f2 100644
--- a/config/default/webform.webform.hhs_fda_form.yml
+++ b/config/default/webform.webform.hhs_fda_form.yml
@@ -117,8 +117,9 @@ elements: |-
fee_amount_willing:
'#type': textfield
'#title': 'The amount of money you’re willing to pay in fees, if any'
- '#help': 'There is no initial fee required to submit a FOIA request, but the FOIA does allow people requesting records to be charged certain types of fees in some instances.'
- '#pattern': '^(?=.)([+\-\$]?([0-9]*)(\.([0-9]+))?)$'
+ '#help': '
There is no initial fee required to submit a FOIA request, but the FOIA does allow people requesting records to be charged certain types of fees in some instances.
'
+ '#pattern': '^(?=(?:\D*\d){1,6}\D*$)[+\-\$]?([0-9]*)(\.([0-9]+))?$'
+ '#pattern_error': 'Please enter a number between 0 and 999999.'
'#counter_type': word
'#counter_maximum': 1
expedited_processing:
diff --git a/docroot/.htaccess b/docroot/.htaccess
index 69cd9c0a1..05491cc25 100644
--- a/docroot/.htaccess
+++ b/docroot/.htaccess
@@ -39,6 +39,10 @@ AddEncoding gzip svgz
php_value always_populate_raw_post_data -1
+
+ Header set Cross-Origin-Opener-Policy "same-origin"
+
+
# Requires mod_expires to be enabled.
# Enable expirations.
diff --git a/docroot/sites/default/settings/includes.settings.php b/docroot/sites/default/settings/includes.settings.php
index 13c53ad43..c7fe5754b 100644
--- a/docroot/sites/default/settings/includes.settings.php
+++ b/docroot/sites/default/settings/includes.settings.php
@@ -35,31 +35,31 @@
switch ($ah_env) {
case 'dev':
$config['samlauth.authentication']['sp_entity_id'] = 'doj_foia_api_dev';
- $config['samlauth.authentication']['idp_single_sign_on_service'] = 'https://login.stage.max.gov/idp/profile/SAML2/Redirect/SSO';
- $config['samlauth.authentication']['idp_entity_id'] = 'https://login.stage.max.gov/idp/shibboleth';
+ $config['samlauth.authentication']['idp_single_sign_on_service'] = 'https://int.fedhub.hhs.gov/ABaaS/idp';
+ $config['samlauth.authentication']['idp_entity_id'] = 'https://int.fedhub.hhs.gov/ABaaS/idp';
break;
case 'test':
$config['samlauth.authentication']['sp_entity_id'] = 'doj_foia_api_test';
- $config['samlauth.authentication']['idp_single_sign_on_service'] = 'https://login.stage.max.gov/idp/profile/SAML2/Redirect/SSO';
- $config['samlauth.authentication']['idp_entity_id'] = 'https://login.stage.max.gov/idp/shibboleth';
+ $config['samlauth.authentication']['idp_single_sign_on_service'] = 'https://int.fedhub.hhs.gov/ABaaS/idp';
+ $config['samlauth.authentication']['idp_entity_id'] = 'https://int.fedhub.hhs.gov/ABaaS/idp';
break;
case 'uat':
$config['samlauth.authentication']['sp_entity_id'] = 'doj_foia_api_uat';
- $config['samlauth.authentication']['idp_single_sign_on_service'] = 'https://login.stage.max.gov/idp/profile/SAML2/Redirect/SSO';
- $config['samlauth.authentication']['idp_entity_id'] = 'https://login.stage.max.gov/idp/shibboleth';
+ $config['samlauth.authentication']['idp_single_sign_on_service'] = 'https://int.fedhub.hhs.gov/ABaaS/idp';
+ $config['samlauth.authentication']['idp_entity_id'] = 'https://int.fedhub.hhs.gov/ABaaS/idp';
break;
case 'prod':
$config['samlauth.authentication']['sp_entity_id'] = 'doj_foia_api_prod';
- $config['samlauth.authentication']['idp_single_sign_on_service'] = 'https://login.max.gov/idp/profile/SAML2/Redirect/SSO';
- $config['samlauth.authentication']['idp_entity_id'] = 'https://login.max.gov/idp/shibboleth';
+ $config['samlauth.authentication']['idp_single_sign_on_service'] = 'https://fedhub.hhs.gov/ABaaS/idp';
+ $config['samlauth.authentication']['idp_entity_id'] = 'https://fedhub.hhs.gov/ABaaS/idp';
break;
}
$config['samlauth.authentication']['sp_x509_certificate'] = 'file:/var/www/html/foia.' . $ah_env . '/acquia-files/saml/samlauth_key.pub';
$config['samlauth.authentication']['sp_private_key'] = 'file:/var/www/html/foia.' . $ah_env . '/acquia-files/saml/samlauth_key';
- $config['samlauth.authentication']['idp_certs'][0] = 'file:/var/www/html/foia.' . $ah_env . '/acquia-files/saml/max_key.pub';
+ $config['samlauth.authentication']['idp_certs'][0] = 'file:/var/www/html/foia.' . $ah_env . '/acquia-files/saml/fedhub_key.pub';
}
diff --git a/simplesamlphp/config/acquia_config.php b/simplesamlphp/config/acquia_config.php
deleted file mode 100644
index 749fb555c..000000000
--- a/simplesamlphp/config/acquia_config.php
+++ /dev/null
@@ -1,121 +0,0 @@
- [
- '127.0.0.1',
- 'dns-master',
- ],
- ]);
- $response = $resolver->query("cluster-{$creds['db_cluster_id']}.mysql", 'CNAME');
- $creds['host'] = $response->answer[0]->cname;
- }
- catch (Net_DNS2_Exception $e) {
- $creds['host'] = "";
- }
- }
- $config['store.type'] = 'sql';
- $config['store.sql.dsn'] = sprintf('mysql:host=%s;port=%s;dbname=%s', $creds['host'], $creds['port'], $creds['name']);
- $config['store.sql.username'] = $creds['user'];
- $config['store.sql.password'] = $creds['pass'];
- $config['store.sql.prefix'] = 'simplesaml';
-}
diff --git a/simplesamlphp/config/authsources.php b/simplesamlphp/config/authsources.php
deleted file mode 100644
index 7a2bd2cfb..000000000
--- a/simplesamlphp/config/authsources.php
+++ /dev/null
@@ -1,354 +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',
- 'idp' => $idp,
- 'NameIDPolicy' => FALSE,
- 'AuthnContextClassRef' => 'https://max.gov/icam/2015/10/securityLevels/securePlus2',
-
- // 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:Static',
- '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',
- ],
- */
-
- /*
- // Twitter OAuth Authentication API.
- // Register your application to get an API key here:
- // http://twitter.com/oauth_clients
- 'twitter' => [
- 'authtwitter:Twitter',
- 'key' => 'xxxxxxxxxxxxxxxx',
- 'secret' => 'xxxxxxxxxxxxxxxx',
-
- // Forces the user to enter their credentials to ensure the correct users account is authorized.
- // Details: https://dev.twitter.com/docs/api/1/get/oauth/authenticate
- 'force_login' => false,
- ],
- */
-
- /*
- // 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/simplesamlphp/config/config.php b/simplesamlphp/config/config.php
deleted file mode 100644
index d50fbb4b9..000000000
--- a/simplesamlphp/config/config.php
+++ /dev/null
@@ -1,1123 +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',
-
- /*
- * 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]
- *
- */
- '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' => false,
-
-
-
- /**************************
- | 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,
- 'enable.wsfed-sp' => false,
- 'enable.authmemcookie' => false,
-
- /*
- * Default IdP for WS-Fed.
- */
- 'default-wsfed-idp' => 'urn:federation:pingfederate:localhost',
-
- /*
- * 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.
- * 'saml' => 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,
-
- /*
- * 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),
-
- /**
- * 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'
-
- /*
- * 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,
-
-
-
- /*********************
- | 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',
-];
-
-
-
-/**
- * FOIA specific customization so that saml admin credentials are not exposed.
- */
-if (file_exists('/var/www/site-php')) {
- include_once '/mnt/gfs/home/foia/config/saml/acquia_config.php';
-} else {
- include_once 'acquia_config.php';
-}
diff --git a/simplesamlphp/metadata/saml20-idp-remote.php b/simplesamlphp/metadata/saml20-idp-remote.php
deleted file mode 100644
index f56e595b0..000000000
--- a/simplesamlphp/metadata/saml20-idp-remote.php
+++ /dev/null
@@ -1,171 +0,0 @@
- 'https://login.max.gov/idp/shibboleth',
- 'contacts' => [],
- 'metadata-set' => 'saml20-idp-remote',
- 'SingleSignOnService' => [
- 0 => [
- 'Binding' => 'urn:mace:shibboleth:1.0:profiles:AuthnRequest',
- 'Location' => 'https://login.max.gov/idp/profile/Shibboleth/SSO',
- ],
- 1 => [
- 'Binding' => 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST',
- 'Location' => 'https://login.max.gov/idp/profile/SAML2/POST/SSO',
- ],
- 2 => [
- 'Binding' => 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign',
- 'Location' => 'https://login.max.gov/idp/profile/SAML2/POST-SimpleSign/SSO',
- ],
- 3 => [
- 'Binding' => 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect',
- 'Location' => 'https://login.max.gov/idp/profile/SAML2/Redirect/SSO',
- ],
- ],
- 'SingleLogoutService' => [],
- 'ArtifactResolutionService' => [],
- 'NameIDFormats' => [],
- 'keys' => [
- 0 => [
- 'encryption' => false,
- 'signing' => true,
- 'type' => 'X509Certificate',
- 'X509Certificate' => '
-MIIDHzCCAgegAwIBAgIUPdRdrl5geFw6rcdLCg9XQr5fpqowDQYJKoZIhvcNAQEF BQAwGDEWMBQGA1UEAwwNbG9naW4ubWF4LmdvdjAeFw0xNTAyMjcxNzM0MjVaFw0z NTAyMjcxNzM0MjVaMBgxFjAUBgNVBAMMDWxvZ2luLm1heC5nb3YwggEiMA0GCSqG SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCP/XwjR/J27ORJWOdK+Kfj3UE74x2OrrVp RvBGRkzv34YY7bSApD0s/WOz2h4fHa496LSZ8mc2ZmY6Tcmq2U1Sy+W6wECPr/Bj ZXpJPzAh3BBnrnO41lD8RIHBmpvPxPsOdrGwxOwVggg86fN31RI0gBHcbn3KPz7s K/9cHC55QL01qzpjhCCp1cZ2ZrEzfu3V1jpRoIsOYWIXlbj2Fn+rziOUrnUO+eMF pwDeifJqKUXBV7ZM8VejC9Z60uNmV2JPm9CHnjhCxul0fAChm+vPsw1DneoAw1m1 LZk/SmuKqFVHuLVBn32I/lUuK/ugr8ww1FPMaqtdR46s5bTe+tYTAgMBAAGjYTBf MB0GA1UdDgQWBBRky4lFS031okDAefZKehA27/DZIDA+BgNVHREENzA1gg1sb2dp bi5tYXguZ292hiRodHRwczovL2xvZ2luLm1heC5nb3YvaWRwL3NoaWJib2xldGgw DQYJKoZIhvcNAQEFBQADggEBAD/dpBgAQMwbHakIDukwDOX2GBWu+l+jZt/1KqlZ YuxeNjRB54rZp70SOkARlUtWP8fdm6Lp1R1JxzqIsI8nde0lBCXw21lGQDzXVm+z rMmsS/KS9N1WM9Wqg0VJgTC4EHnK1OxfUVfH6gG6GV8+pSTv2tM2SKBiG5cQ9g/i 2mh/M8aPg05TA+IZCMOnKIgnkEq3YhI2OS80a9qrSKZh8X4/+DklGHWzbdOV8pW0 CQ3LQo/QLeCJHTdqga2i5y0aKcyX3d7pNlJZh1PMInz9Lmd4WFHllaDgRxWsWCRW x1DFvVHKK/lPRTV+5Emt3dzy+gVd1ZnSxCVbkt2SswlPdGI=
-',
- ],
- ],
- 'scope' => [
- 0 => 'max.gov',
- ],
-];
-
-$metadata['https://login.test.max.gov/idp/shibboleth'] = [
- 'entityid' => 'https://login.test.max.gov/idp/shibboleth',
- 'contacts' => [],
- 'metadata-set' => 'saml20-idp-remote',
- 'SingleSignOnService' => [
- 0 => [
- 'Binding' => 'urn:mace:shibboleth:1.0:profiles:AuthnRequest',
- 'Location' => 'https://login.test.max.gov/idp/profile/Shibboleth/SSO',
- ],
- 1 => [
- 'Binding' => 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST',
- 'Location' => 'https://login.test.max.gov/idp/profile/SAML2/POST/SSO',
- ],
- 2 => [
- 'Binding' => 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign',
- 'Location' => 'https://login.test.max.gov/idp/profile/SAML2/POST-SimpleSign/SSO',
- ],
- 3 => [
- 'Binding' => 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect',
- 'Location' => 'https://login.test.max.gov/idp/profile/SAML2/Redirect/SSO',
- ],
- ],
- 'SingleLogoutService' => [],
- 'ArtifactResolutionService' => [],
- 'NameIDFormats' => [],
- 'keys' => [
- 0 => [
- 'encryption' => false,
- 'signing' => true,
- 'type' => 'X509Certificate',
- 'X509Certificate' => '
-MIIDMzCCAhugAwIBAgIUGZmNOfGrnHuo8FkedfSoNuXGh0swDQYJKoZIhvcNAQEF BQAwHTEbMBkGA1UEAwwSbG9naW4udGVzdC5tYXguZ292MB4XDTE1MDIyNjE4NTgy MloXDTM1MDIyNjE4NTgyMlowHTEbMBkGA1UEAwwSbG9naW4udGVzdC5tYXguZ292 MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAl6OO43kdFgZFYNBxBxnW f965G3h0Z1l+CM4rfDoRW7ieIiYnkolsln738hb21M8Q0SXqniKFGaptUNNyTGkB 5R8Dk1zljkrh4KdnKhj3gZu2OnjJ8L4ihR0gdiJuXxvVGaI+KcU0b2Ahz4TBi/DZ ts4c4CJFzmdFL57QjOsBT8jgg3tXQDncl+w0kx+fGFaVTS6tIsN18LscFr0lmHEE E0w3vfOu5CP2G3+MPnJ2ij6urmJdsxyRqHdiHKS3ItpCTWMmt5duvlg3QPK/21C9 J7nnuDXPSfhym0gihXvdNt71y4aDI3tqXR3eIaz7ljjEO2PDG6yJwMsE23HhEbW9 FwIDAQABo2swaTAdBgNVHQ4EFgQUDBhTOWKufUoHOvgmiZO0gFohONIwSAYDVR0R BEEwP4ISbG9naW4udGVzdC5tYXguZ292hilodHRwczovL2xvZ2luLnRlc3QubWF4 Lmdvdi9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQUFAAOCAQEABmVizMnSUZ0g AB13t0KdmVqdDh3fp0wsuj9XhUyWlaOyWt8FtcKrr4V3eH281Of1VaG4IAgmHynr CyyDlaU+2rN3X9Mnaz2kgt7fYMiVbU945h4h8X8+DqS4fl+HEP0OpSG0rqTAJ1yN A0nmnYZEeKDwJbTUXaL7w5D+4WNNYDpJ+yVEAno98cLPZtgh0NlpdEl09SK/k0Bm aY6ptcDxOa7FfTeQX9GUmulJTErLen/QHoQf6mQN14y1woXwI/kPpAD8C4Wi5N/P Z00nZfcqMpeatQMt91IiI2IRSInyZ8UU0UqdY3XIJFDDoXyK/SsI5NBZksz0MrbG lJsgPWOAxg==
-',
- ],
- ],
- 'scope' => [
- 0 => 'max.gov',
- ],
-];
-
-$metadata['https://login.stage.max.gov/idp/shibboleth'] = array (
- 'entityid' => 'https://login.stage.max.gov/idp/shibboleth',
- 'contacts' =>
- array (
- ),
- 'metadata-set' => 'saml20-idp-remote',
- 'SingleSignOnService' =>
- array (
- 0 =>
- array (
- 'Binding' => 'urn:mace:shibboleth:1.0:profiles:AuthnRequest',
- 'Location' => 'https://login.stage.max.gov/idp/profile/Shibboleth/SSO',
- ),
- 1 =>
- array (
- 'Binding' => 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST',
- 'Location' => 'https://login.stage.max.gov/idp/profile/SAML2/POST/SSO',
- ),
- 2 =>
- array (
- 'Binding' => 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign',
- 'Location' => 'https://login.stage.max.gov/idp/profile/SAML2/POST-SimpleSign/SSO',
- ),
- 3 =>
- array (
- 'Binding' => 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect',
- 'Location' => 'https://login.stage.max.gov/idp/profile/SAML2/Redirect/SSO',
- ),
- ),
- 'SingleLogoutService' =>
- array (
- 0 =>
- array (
- 'Binding' => 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect',
- 'Location' => 'https://login.stage.max.gov/idp/profile/SAML2/Redirect/SLO',
- ),
- 1 =>
- array (
- 'Binding' => 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST',
- 'Location' => 'https://login.stage.max.gov/idp/profile/SAML2/POST/SLO',
- ),
- 2 =>
- array (
- 'Binding' => 'urn:oasis:names:tc:SAML:2.0:bindings:SOAP',
- 'Location' => 'https://login.stage.max.gov/idp/profile/SAML2/SOAP/SLO',
- ),
- ),
- 'ArtifactResolutionService' =>
- array (
- 0 =>
- array (
- 'Binding' => 'urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding',
- 'Location' => 'https://login.stage.max.gov/idp/profile/SAML1/SOAP/ArtifactResolution',
- 'index' => 1,
- ),
- 1 =>
- array (
- 'Binding' => 'urn:oasis:names:tc:SAML:2.0:bindings:SOAP',
- 'Location' => 'https://login.stage.max.gov/idp/profile/SAML2/SOAP/ArtifactResolution',
- 'index' => 2,
- ),
- ),
- 'NameIDFormats' =>
- array (
- 0 => 'urn:mace:shibboleth:1.0:nameIdentifier',
- 1 => 'urn:oasis:names:tc:SAML:2.0:nameid-format:transient',
- ),
- 'keys' =>
- array (
- 0 =>
- array (
- 'encryption' => false,
- 'signing' => true,
- 'type' => 'X509Certificate',
- 'X509Certificate' => 'MIIDODCCAiCgAwIBAgIVAIt37bpkVQbi5DGlmw+bIzL8qIDdMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMME2xvZ2luLnN0YWdlLm1heC5nb3YwHhcNMTYwNjIzMTcxMTEwWhcNMzYwNjIzMTcxMTEwWjAeMRwwGgYDVQQDDBNsb2dpbi5zdGFnZS5tYXguZ292MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmDOvx90OJIEihGG87XMF5kPIoM5+4o9/8bLsr1B+11m6swyD69fweFxSC898sQp64ecdkWqX85CRXn04zh0IyINPgCbZA8JhvdCCeY6ZsWMvVj8WDM3o8BDT+owAcTWeekJQwtC4AsUEgYUjfsZ3SaNLfRVrog1ZoLZqARLVMMDBmkV2BO1qcEQZMlAauPPnKLuCG053eeFozqU3Jwp62whU14fN/YGp8g9V6jJFl3Ryw5DfF1sjuu0ZV48UxvpojGq+tYCmOTDT3x47kP+auiD8ZPs1GeUCpXoR9PDcvXzdFk04XXBiiYEBYvL6jUwPhgVdF1pquy6uaM3VioVRYwIDAQABo20wazAdBgNVHQ4EFgQUjZgk45a/61ud3ajgA29Wmf2Jf48wSgYDVR0RBEMwQYITbG9naW4uc3RhZ2UubWF4LmdvdoYqaHR0cHM6Ly9sb2dpbi5zdGFnZS5tYXguZ292L2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBBQUAA4IBAQCPJZ939ZWE1EwyTlt1p+nkLQGsQ1IWaBPsBR5cE01NCcndj0B3yUMo3ZpaENLYvSh7hglgh7HH8NdEo01eSwkTsUYnzL2GAjiIGbgXcWyqoVugCw/qIkL/32R1qsw+/yhcbHwrstApH5B8sS5EMI/Ky9nMG1WfzJOploXCEmBryodM8S3CHgnBmd7Fq9eEq3cNbAZG/BZlO92B8frFFQWNvNtua88dMRtyzRbrwT66vi+7FqTEx0k5gMWXf+U18qQuZ1KHxlEXUIWssobl5E+12XYwjgXhFGX9iLxvbRBIhb0+6OcwEyXKbXnLKDR1jRJ6bOBImKg09FKwk3eR0CPH',
- ),
- ),
- 'scope' =>
- array (
- 0 => 'max.gov',
- ),
-);
diff --git a/tests/behat/features/Administrator.feature b/tests/behat/features/Administrator.feature
index 64649ea21..e4e7c6fa4 100644
--- a/tests/behat/features/Administrator.feature
+++ b/tests/behat/features/Administrator.feature
@@ -70,6 +70,7 @@ Feature: Agency Administrator role
When I am on the homepage
Then I should see the link 'Manage'
+
@api
Scenario: Agency Administrator can view unpublished content
Given "agency" terms:
@@ -86,6 +87,7 @@ Feature: Agency Administrator role
And for 'Zip code' I enter '12345'
And I uncheck the box "Published"
And I press the 'Save' button
+ And the cache has been cleared
Then I should see the following success messages:
| Success messages |
| Agency Component A Test Agency Component has been created. |
@@ -122,3 +124,4 @@ Feature: Agency Administrator role
When I am logged in as a user with the 'Agency Administrator' role
And I am at 'form/hhs-nih-form'
And I select "Office of the Director" from "Select the NIH institute"
+
diff --git a/tests/behat/features/AnnualFOIAReportData.feature b/tests/behat/features/AnnualFOIAReportData.feature
index 78238d862..5ec168b08 100644
--- a/tests/behat/features/AnnualFOIAReportData.feature
+++ b/tests/behat/features/AnnualFOIAReportData.feature
@@ -30,6 +30,7 @@ Feature: Annual FOIA Report Data Feature
Scenario: Agency Administrator can add Annual FOIA Reports
Given I am logged in as a user with the 'Agency Administrator' role
And I am on "/node/add"
+ And the cache has been cleared
Then I should see the link "Annual FOIA Report Data"
@api @javascript