Merge branch 'master-patch-49cd' into 'master'

Use allowlist and denylist

See merge request https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/7076

Merged-by: Balasankar 'Balu' C <[email protected]>
Approved-by: Clemens Beck <[email protected]>
Approved-by: Balasankar 'Balu' C <[email protected]>
Co-authored-by: Oscar Tovar <[email protected]>

Author: balasankarc

lib/gitlab/license/analyzer.rb

@@ -39,15 +39,15 @@ class Analyzer
       'elkjs',           # EPL 2.0 - https://github.com/kieler/elkjs/blob/master/LICENSE.md
     ]
     # readline is GPL licensed and its use was not mere aggregation. Hence it is
-    # blacklisted.
+    # denylisted.
     # Details: https://gitlab.com/gitlab-org/omnibus-gitlab/issues/1945#note_29286329
     @software_unacceptable = ['readline']
 
     def self.software_check(dependency)
       if @software_unacceptable.include?(dependency)
-        ['unacceptable', 'Blacklisted software']
+        ['unacceptable', 'Denylisted software']
       elsif @software_acceptable.include?(dependency)
-        ['acceptable', 'Whitelisted software']
+        ['acceptable', 'Allowlisted software']
       end
     end
 
@@ -82,7 +82,7 @@ def self.status_string(dependency, version, license, status, reason, level)
       when 'acceptable'
         if reason == 'Acceptable license'
           string = "\t" * level + "✓ #{dependency} - #{version} uses #{license} - #{reason}\n"
-        elsif reason == 'Whitelisted software'
+        elsif reason == 'Allowlisted software'
           string = "\t" * level + "# #{dependency} - #{version} uses #{license} - #{reason}\n"
         end
       when 'unacceptable'

spec/lib/gitlab/tasks/license_spec.rb

@@ -37,7 +37,7 @@
     expect { Rake::Task['license:check'].invoke }.to output(/✓.*chef-zero - 4.8.0.*Apache-2.0/).to_stdout
   end
 
-  it 'detects blacklisted softwares with good licenses correctly' do
+  it 'detects denylisted softwares with good licenses correctly' do
     license_info = '[
       {
         "name": "readline",
@@ -54,7 +54,7 @@
      ]'
     allow(File).to receive(:read).and_return(license_info)
 
-    expect { Rake::Task['license:check'].invoke }.to output(/readline.*Blacklisted software/).to_stdout.and raise_error(RuntimeError, "Build Aborted due to license violations")
+    expect { Rake::Task['license:check'].invoke }.to output(/readline.*Denylisted software/).to_stdout.and raise_error(RuntimeError, "Build Aborted due to license violations")
   end
 
   it 'detects bad licenses correctly' do
@@ -77,7 +77,7 @@
     expect { Rake::Task['license:check'].invoke }.to output(/foo.*Unacceptable license/).to_stdout.and raise_error(RuntimeError, "Build Aborted due to license violations")
   end
 
-  it 'detects whitelisted softwares with bad licenses correctly' do
+  it 'detects allowlisted softwares with bad licenses correctly' do
     license_info = '[
       {
         "name": "git",
@@ -94,10 +94,10 @@
      ]'
     allow(File).to receive(:read).and_return(license_info)
 
-    expect { Rake::Task['license:check'].invoke }.to output(/git.*Whitelisted software/).to_stdout
+    expect { Rake::Task['license:check'].invoke }.to output(/git.*Allowlisted software/).to_stdout
   end
 
-  it 'detects blacklisted softwares with unknown licenses correctly' do
+  it 'detects denylisted softwares with unknown licenses correctly' do
     license_info = '[
       {
         "name": "readline",
@@ -114,10 +114,10 @@
      ]'
     allow(File).to receive(:read).and_return(license_info)
 
-    expect { Rake::Task['license:check'].invoke }.to output(/readline.*Blacklisted software/).to_stdout.and raise_error(RuntimeError, "Build Aborted due to license violations")
+    expect { Rake::Task['license:check'].invoke }.to output(/readline.*Denylisted software/).to_stdout.and raise_error(RuntimeError, "Build Aborted due to license violations")
   end
 
-  it 'detects whitelisted software with unknown licenses correctly' do
+  it 'detects allowlisted software with unknown licenses correctly' do
     license_info = '[
       {
         "name": "git",
@@ -133,7 +133,7 @@
       }
      ]'
     allow(File).to receive(:read).and_return(license_info)
-    expect { Rake::Task['license:check'].invoke }.to output(/git.*Whitelisted software/).to_stdout
+    expect { Rake::Task['license:check'].invoke }.to output(/git.*Allowlisted software/).to_stdout
   end
 
   it 'should detect if install directory not found' do