missing settings

TAMULib · Oct 13, 2022 · 65a9f00 · 65a9f00
1 parent f805a65
commit 65a9f00
Show file tree

Hide file tree

Showing 6 changed files with 44 additions and 23 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1482,6 +1482,11 @@ GEM
     omniauth-identity (1.1.1)
       bcrypt-ruby (~> 3.0)
       omniauth (~> 1.0)
+    omniauth-ldap (1.0.5)
+      net-ldap (~> 0.12)
+      omniauth (~> 1.0)
+      pyu-ruby-sasl (~> 0.0.3.2)
+      rubyntlm (~> 0.3.4)
     orm_adapter (0.5.0)
     os (1.0.1)
     parallel (1.17.0)
@@ -1504,6 +1509,7 @@ GEM
     public_suffix (3.0.3)
     puma (4.3.5)
       nio4r (~> 2.0)
+    pyu-ruby-sasl (0.0.3.3)
     raabro (1.3.1)
     racc (1.5.2)
     rack (2.2.3)
@@ -1674,6 +1680,7 @@ GEM
       mime-types
       nokogiri
       rest-client
+    rubyntlm (0.3.4)
     rubyzip (1.3.0)
     safe_yaml (1.0.5)
     samvera-persona (0.1.7)
@@ -1765,6 +1772,8 @@ GEM
       railties (>= 3.1)
     tzinfo (1.2.9)
       thread_safe (~> 0.1)
+    tzinfo-data (1.2022.1)
+      tzinfo (>= 1.0.0)
     uber (0.0.15)
     uglifier (4.1.20)
       execjs (>= 0.3.0, < 3)
@@ -1893,6 +1902,7 @@ DEPENDENCIES
   noid-rails (~> 3.0.1)
   okcomputer
   omniauth-identity
+  omniauth-ldap
   omniauth-lti!
   parallel
   pg
@@ -1929,6 +1939,7 @@ DEPENDENCIES
   sprockets (~> 3.7.2)
   sprockets-es6
   sqlite3
+  tzinfo-data
   uglifier (>= 1.3.0)
   wavefile (~> 1.0.1)
   web-console
@@ -1941,4 +1952,4 @@ DEPENDENCIES
   zoom
 
 BUNDLED WITH
-   2.2.11
+   2.3.17
diff --git a/config/controlled_vocabulary.yml b/config/controlled_vocabulary.yml
@@ -5,6 +5,7 @@ units:
   - Graduate Student Research  
   - LAUNCH
   - Oaktrust
+  - University Libraries
 identifier_types:
   local: Catalog Key
   oclc: OCLC

diff --git a/config/settings.yml b/config/settings.yml
@@ -8,7 +8,7 @@ dropbox:
   upload_uri: <%= ENV['env_dropbox_upload_uri'] %>
 encoding:
   engine_adapter: ffmpeg
-  presets_path: config/ffmpeg_presets.yml
+  presets_path: 'config/ffmpeg_presets.yml'
   working_file_path: '<%= ENV['env_encoding_working_file_path'] %>'  
 mediainfo:
   path: '/usr/bin/mediainfo'
@@ -51,8 +51,8 @@ streaming:
   rtmp_base: '<%= ENV['env_streaming_rtmp_base'] %>'
   default_quality: 'auto'
 redis:
-  host: <%= ENV['env_redis_host'] %>
-  port: <%= ENV['env_redis_port'] %>
+  host: '<%= ENV['env_redis_host'] %>'
+  port: '<%= ENV['env_redis_port'] %>'
 master_file_management:
   strategy: 'delete' #'delete', or 'move' (for move uncomment and configure next line)
   path: '/mnt/avalon/avalon-archive'  

diff --git a/lib/hydra/multiple_policy_aware_access_controls_enforcement.rb b/lib/hydra/multiple_policy_aware_access_controls_enforcement.rb
@@ -51,7 +51,9 @@ def apply_policy_group_permissions(permission_types = discovery_permissions, pol
       user_access_filters = []
       current_ability.user_groups.each_with_index do |group, i|
         permission_types.each do |type|
-          user_access_filters << "(" + escape_filter(Hydra.config.permissions.inheritable[type.to_sym].group, group) + policy_class_clause + ")"
+			if !group.nil? && !group.empty?
+				user_access_filters << "(" + escape_filter(Hydra.config.permissions.inheritable[type.to_sym].group, group) + policy_class_clause + ")"
+			end
         end
       end
       user_access_filters

diff --git a/role_map.yml b/role_map.yml
@@ -0,0 +1,7 @@
+production:
+  administrator:
+    - [email protected]
+  manager:
+    - [email protected]
+  group_manager:
+    - [email protected]
diff --git a/yarn.lock b/yarn.lock
@@ -1486,10 +1486,10 @@ bluebird@^3.5.3:
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.3.tgz#7d01c6f9616c9a51ab0f8c549a79dfe6ec33efa7"
   integrity sha512-/qKPUQlaW1OyR51WeCPBvRnAlnZFUJkCSG5HzGnuIqhgyJtF+T94lFnn33eiazjRm2LAHVy2guNnaq48X9SJuw==
 
-bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.11.9:
-  version "4.12.0"
-  resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.12.0.tgz#775b3f278efbb9718eec7361f483fb36fbbfea88"
-  integrity sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==
+bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.4.0:
+  version "4.11.9"
+  resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.9.tgz#26d556829458f9d1e81fc48952493d0ba3507828"
+  integrity sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==
 
 [email protected]:
   version "1.18.3"
@@ -1548,7 +1548,7 @@ braces@^2.3.1, braces@^2.3.2:
     split-string "^3.0.2"
     to-regex "^3.0.1"
 
-brorand@^1.0.1, brorand@^1.1.0:
+brorand@^1.0.1:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
   integrity sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=
@@ -2720,17 +2720,17 @@ electron-to-chromium@^1.3.113:
   integrity sha512-De+lPAxEcpxvqPTyZAXELNpRZXABRxf+uL/rSykstQhzj/B0l1150G/ExIIxKc16lI89Hgz81J0BHAcbTqK49g==
 
 elliptic@^6.0.0, elliptic@^6.5.2:
-  version "6.5.4"
-  resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.4.tgz#da37cebd31e79a1367e941b592ed1fbebd58abbb"
-  integrity sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==
+  version "6.5.3"
+  resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.3.tgz#cb59eb2efdaf73a0bd78ccd7015a62ad6e0f93d6"
+  integrity sha512-IMqzv5wNQf+E6aHeIqATs0tOLeOTwj1QKbRcS3jBbYkl5oLAserA8yJTT7/VyHUYG91PRmPyeQDObKLPpeS4dw==
   dependencies:
-    bn.js "^4.11.9"
-    brorand "^1.1.0"
+    bn.js "^4.4.0"
+    brorand "^1.0.1"
     hash.js "^1.0.0"
-    hmac-drbg "^1.0.1"
-    inherits "^2.0.4"
-    minimalistic-assert "^1.0.1"
-    minimalistic-crypto-utils "^1.0.1"
+    hmac-drbg "^1.0.0"
+    inherits "^2.0.1"
+    minimalistic-assert "^1.0.0"
+    minimalistic-crypto-utils "^1.0.0"
 
 emoji-regex@^7.0.1:
   version "7.0.3"
@@ -3475,7 +3475,7 @@ hls.js@^0.13.3-canary.5556:
     eventemitter3 "3.1.0"
     url-toolkit "^2.1.6"
 
-hmac-drbg@^1.0.1:
+hmac-drbg@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1"
   integrity sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=
@@ -3737,7 +3737,7 @@ inflight@^1.0.4:
     once "^1.3.0"
     wrappy "1"
 
-inherits@2, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3:
+inherits@2, inherits@~2.0.0, inherits@~2.0.3:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
   integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
@@ -3747,7 +3747,7 @@ [email protected]:
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1"
   integrity sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=
 
-[email protected]:
+[email protected], inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.1:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
   integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
@@ -4594,7 +4594,7 @@ minimalistic-assert@^1.0.0, minimalistic-assert@^1.0.1:
   resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7"
   integrity sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==
 
-minimalistic-crypto-utils@^1.0.1:
+minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
   integrity sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=