Release 26.1.0

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)
+

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

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

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: '<a href="{{ edit_node_1 }}/annual_report_agency_info">Edit by section</a>'
+            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

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': '<p>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.</p>'
+    '#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:

docroot/.htaccess

@@ -39,6 +39,10 @@ AddEncoding gzip svgz
   php_value always_populate_raw_post_data   -1
 </IfModule>
 
+<IfModule mod_headers.c>
+  Header set Cross-Origin-Opener-Policy "same-origin"
+</IfModule>
+
 # Requires mod_expires to be enabled.
 <IfModule mod_expires.c>
   # Enable expirations.

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';
 }