uc3-dmp-id 0.0.10 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 35192e984c146cf3891bc898ed03d3f100338a150a379e61e90da8c978b16050
-  data.tar.gz: 1c75e1a057e8b45fb26b56e6b4569f47dc496bf3d0bd66c00ddebc8d3be85ccd
+  metadata.gz: c0a0a7c8a7c2ec3b7bfdc0051c323b85ba6f7bb14aa0bc1f77e499b7682b3814
+  data.tar.gz: 9bb5fa376caa1d07bd243cebad4b5757771eb996a4723c200366c034fdf56b2c
 SHA512:
-  metadata.gz: 564ac8f207a3a156c73d3258f4de65d62e44841569e9f4a3808c88031ff0c5c75429d7922c2ed60a1146731e9c282170c111c3fd8a41524c9f9cb9e4bb608b9a
-  data.tar.gz: 4bb2d583e5863ecc0b299a2f25c3042fc3f2615326a0545e2160e5f668db35dd3e2fe66be5c4ec1e0c630ef02a86dd1f986ea81f401e9c1f60fd6a455bb60980
+  metadata.gz: 8b8ff1171c5127af8fedbfe85bf2c74b4a61f25dc4bab73e42fa1903bbe36c9a20adb0f9db2b1906c6542f7172496ea9173b05c047b20392577d5cc9341002db
+  data.tar.gz: '079687ec9e07dddde7afcbcd9d1b6dc0b3606276f735e4040ca0183e378f1bc0c72017747d48dde140c32b922e7ce6825afc5b3961d6b93503ce4c2052226495'

data/lib/uc3-dmp-id/finder.rb

@@ -28,7 +28,7 @@ module Uc3DmpId
 
         args = {
           key_conditions: {
-            PK: { attribute_value_list: [Helper.append_pk_prefix(dmp: p_key)], comparison_operator: 'EQ' }
+            PK: { attribute_value_list: [Helper.append_pk_prefix(p_key: p_key)], comparison_operator: 'EQ' }
           },
           projection_expression: 'modified',
           scan_index_forward: false
@@ -65,13 +65,16 @@ module Uc3DmpId
         client = client.nil? ? Uc3DmpDynamo::Client.new(debug: debug) : client
         resp = client.get_item(
           key: {
-            PK: Helper.append_pk_prefix(dmp: p_key),
+            PK: Helper.append_pk_prefix(p_key: p_key),
             SK: s_key.nil? || s_key.strip.empty? ? Helper::DMP_LATEST_VERSION : s_key
           }
         )
-        return nil if resp.nil? || resp.fetch('dmp', {})['PK'].nil?
+        return resp unless resp.is_a?(Hash)
 
-        _append_versions(p_key: resp['dmp']['PK'], dmp: resp, client: client, debug: debug)
+        dmp = resp['dmp'].nil? ? JSON.parse({ dmp: resp }.to_json) : resp
+        return nil if resp['dmp']['PK'].nil?
+
+        _append_versions(p_key: resp['dmp']['PK'], dmp: dmp, client: client, debug: debug)
       end
 
       # Attempt to find the DMP item by the provenance system's identifier
@@ -92,10 +95,13 @@ module Uc3DmpId
         }
         client = client.nil? ? Uc3DmpDynamo::Client.new(debug: debug) : client
         resp = client.query(**args)
-        return resp if resp.nil? || resp['dmp'].nil?
+        return resp unless resp.is_a?(Hash)
+
+        dmp = resp['dmp'].nil? ? JSON.parse({ dmp: resp }.to_json) : resp
+        return nil if resp['dmp']['PK'].nil?
 
         # If we got a hit, fetch the DMP and return it.
-        by_pk(p_key: resp['dmp']['PK'], s_key: resp['dmp']['SK'])
+        by_pk(p_key: dmp['dmp']['PK'], s_key: dmp['dmp']['SK'])
       end
       # rubocop:enable Metrics/AbcSize
 
@@ -115,7 +121,7 @@ module Uc3DmpId
           timestamp = version['dmp']['modified']
           {
             timestamp: timestamp,
-            url: "#{Helper.api_base_url}dmps/#{Helper.remove_pk_prefix(dmp: p_key)}?version=#{timestamp}"
+            url: "#{Helper.api_base_url}dmps/#{Helper.remove_pk_prefix(p_key: p_key)}?version=#{timestamp}"
           }
         end
         dmp['dmp']['dmphub_versions'] = JSON.parse(versions.to_json)

data/lib/uc3-dmp-id/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Uc3DmpId
-  VERSION = '0.0.10'
+  VERSION = '0.0.12'
 end

data/lib/uc3-dmp-id/waf_analysis_2023-06-05.txt

@@ -0,0 +1,73 @@
+
+WAF analysis
+===========================================================
+
+AWS#AWSManagedRulesCommonRuleSet#NoUserAgent_HEADER
+    Action: REMOVE THIS RULE? I feel like this one will cause more harm then good
+    Blocking: /
+              /plans/98982
+              /nuclei.svg?fc9dz=x  (about 100 times!)
+              /v1/metadata/private-networks
+              /latest/meta-data/
+              /computeMetadata/v1/project/
+              /dynamic/instance-identity/document
+              /openstack/latest
+              /metadata/v1.json
+              /opc/v1/instance
+
+AWS#AWSManagedRulesCommonRuleSet#SizeRestrictions_BODY
+    Action: Add exclusion for this specific path!
+    Blocking: /Shibboleth.sso/SAML2/POST
+
+AWS#AWSManagedRulesAdminProtectionRuleSet#AdminProtection_URIPATH
+    Action: Add exceptions for [/org/admin/, /org_admin/, /super_admin/, /paginable/plans/org_admin]. The others are
+            all illegitimate so we want to block them.
+    Blocking: /org/admin/users/98307/admin_update_permissions
+              /org/admin/users/admin_index
+              /paginable/plans/org_admin/[page]?[query_params]
+              /org_admin/plans
+              /org/admin/543/admin_edit
+              /org/admin/users/admin_index
+              /org/admin/guidance/2163/admin_update
+              /org_admin/templates/1967/phases/2144/sections/11313
+              /org/admin/17/admin_edit
+              /super_admin/users/77446/merge
+
+              /admin/
+              /admin/phpMyAdmin/server_import.php
+              /phpMyAdmin/server_import.php
+              /admin/pma/server_import.php
+              /miscadmin
+              /admin/server_import.php
+              /backend/admin/users?username=anonymous
+              /phpmyadmin/server_import.php
+              /admin/install.php
+              /admin/install/install.php
+              /wp-admin/install.php
+              /solr/admin/
+              /Admin/frmWelcome.aspx
+              /boaform/admin/formLogin?username=user&psd=user
+
+
+AWS#AWSManagedRulesCommonRuleSet#UserAgent_BadBots_HEADER
+    Actions: Block them
+    Blocking: /public_templates?[query_params]
+              /robots.txt
+              /aab8
+              /aaa9
+              /dmptool-ui/SourceSans3VF-Italic.ttf.fd20af5b.woff2
+              /dmptool-ui/SourceSans3VF-Roman.ttf.99aa17fb.woff2
+              /assets/application-4551ebb71fffa2b6d576438af0e66620a4e84cb8431cdd25889e191eed0fae66.js
+
+AWS#AWSManagedRulesAmazonIpReputationList#AWSManagedReconnaissanceList
+    Actions: Block them
+    Blocking: /
+              /.env
+              /header.php
+
+AWS#AWSManagedRulesCommonRuleSet#CrossSiteScripting_BODY
+    Actions: Add exception for /answers/create_or_update (or better yet address it)
+    Blocking: /answers/create_or_update?question_id=17592
+              /content/crx/de/setPreferences.jsp;%0A.html?keymap=<svg/onload=confirm(document.domain)>//a&language=en
+              /7/0/33/1d/www.citysearch.com/search?what=x&where=place%22%3E%3Csvg+onload=confirm(document.domain)%3E
+              /etc/designs/xh1x.childrenlist.json//%3Csvg%20onload=alert%28document.domain%29%3E.html

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uc3-dmp-id
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.12
 platform: ruby
 authors:
 - Brian Riley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-09 00:00:00.000000000 Z
+date: 2023-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -38,20 +38,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: logger
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.4'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: uc3-dmp-dynamo
   requirement: !ruby/object:Gem::Requirement
@@ -141,6 +127,7 @@ files:
 - lib/uc3-dmp-id/validator.rb
 - lib/uc3-dmp-id/version.rb
 - lib/uc3-dmp-id/versioner.rb
+- lib/uc3-dmp-id/waf_analysis_2023-06-05.txt
 homepage: https://github.com/CDLUC3/dmp-hub-cfn/blob/main/src/sam/gems/uc3-dmp-id
 licenses:
 - MIT