uc3-dmp-id 0.0.11 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5d939c9632627e8210c03f3d0e6a6c742076540d401fd6cb8d20a18fe5007f93
-  data.tar.gz: 3a9b9367c66ff23fe7c710a1ee7cc0fcf29ffa0ebc3eb6861e2ca3ffa7959ab7
+  metadata.gz: 7305cd9930a1eb2f2feb56fa439ef8ebfc95ce5550184f81801989b570b9e56e
+  data.tar.gz: dafe80d52cb7ef18b1dc63c15708955eb8abb608bace639d29df2cbcd96e0aaf
 SHA512:
-  metadata.gz: 0a03ba8fab35515ca126b39fc7ec140823eaa250e560c300bf3d6621a30ddf710a8410ed48d096aac743f037899a84e158c4ddeccccd9c603204d4c6b6570180
-  data.tar.gz: 9ae9ed3c91002df747860dae714b86de88be6e1d5f2d7fdfe24d57fb391fc1fc144bc9c903b23cb6b55c6debb96bdf6744858c18bf77bfbeb89628ccea325a30
+  metadata.gz: 2b14d04b52398da535ef787b15e5f883f9fdf93a6adb1adf34c5e82c459f13c40f481fb214bb17f770502e06a8fe67e3a6692359a2a8e96a5a6918dcd2e134c3
+  data.tar.gz: 3c9eded9447bc3fd9a4b3f2168bc289d812b5b1613a86e4e407ba83ad402be23ca4fd01d113373e93f23c951d1d96d36d6b75863cbad14be27c47376cc9f2ebc

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

@@ -60,18 +60,26 @@ module Uc3DmpId
       def by_pk(p_key:, s_key: Helper::DMP_LATEST_VERSION, client: nil, debug: false)
         raise Uc3DmpIdFinderError, MSG_MISSING_PK if p_key.nil?
 
-        s_key = Helper::DMP_LATEST_VERSION if s_key.nil? || s_key.strip.empty?
+        s_key = Helper::DMP_LATEST_VERSION if s_key.nil? || s_key.to_s.strip.empty?
+
+puts "PK: #{p_key}, SK: #{s_key}"
 
         client = client.nil? ? Uc3DmpDynamo::Client.new(debug: debug) : client
         resp = client.get_item(
           key: {
             PK: Helper.append_pk_prefix(p_key: p_key),
-            SK: s_key.nil? || s_key.strip.empty? ? Helper::DMP_LATEST_VERSION : s_key
+            SK: s_key
           }
         )
-        return nil if resp.nil? || resp.fetch('dmp', {})['PK'].nil?
+        return resp unless resp.is_a?(Hash)
+
+puts "FETCHED:"
+puts resp
+
+        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: resp, client: client, debug: debug)
+        _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 +100,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
 
@@ -106,10 +117,16 @@ module Uc3DmpId
       def _append_versions(p_key:, dmp:, client: nil, debug: false)
         return dmp if p_key.nil? || !dmp.is_a?(Hash) || dmp['dmp'].nil?
 
+puts "FETCHING VERSIONS"
+
         results = versions(p_key: p_key, client: client, debug: debug)
         return dmp unless results.length > 1
 
-        versions = results.map do |version|
+        versions = results.map do |ver|
+
+puts version
+
+          version = ver['dmp'].nil? ? JSON.parse({ dmp: ver }.to_json) : ver
           next if version.fetch('dmp', {})['modified'].nil?
 
           timestamp = version['dmp']['modified']
@@ -119,6 +136,10 @@ module Uc3DmpId
           }
         end
         dmp['dmp']['dmphub_versions'] = JSON.parse(versions.to_json)
+
+puts "AFTER APPENDING VERSIONS:"
+puts dmp
+
         dmp
       end
       # rubocop:enable Metrics/AbcSize

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

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Uc3DmpId
-  VERSION = '0.0.11'
+  VERSION = '0.0.13'
 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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uc3-dmp-id
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.13
 platform: ruby
 authors:
 - Brian Riley
@@ -127,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