From 5c9429515c7099da54aefd98a13c64db793128bc Mon Sep 17 00:00:00 2001
From: Florian Braun <5863788+FloThinksPi@users.noreply.github.com>
Date: Thu, 24 Aug 2023 23:25:25 +0200
Subject: [PATCH] Revert "Add validation for resource match mode"

This reverts commit 22e21222a4bf995613f014bdd9f4afdb0b37cb00
due to the mode limitation to 3-4 characters beeing against the POSIX
Standard as it defines 9 permission bits and 3 file bits with no limit
for more bits. As the documentation is not specific on the further
limitations the currently implemented validation is incorrect.

See also:
https://en.wikipedia.org/wiki/Unix_file_types#Numeric
https://pubs.opengroup.org/onlinepubs/9699919799/
---
 app/messages/resource_match_create_message.rb | 42 ++++++-------------
 .../resource_match_create_message_spec.rb     | 38 -----------------
 2 files changed, 12 insertions(+), 68 deletions(-)

diff --git a/app/messages/resource_match_create_message.rb b/app/messages/resource_match_create_message.rb
index 2ec2079c6c2..31ac953a3e7 100644
--- a/app/messages/resource_match_create_message.rb
+++ b/app/messages/resource_match_create_message.rb
@@ -22,72 +22,54 @@ def v2_fingerprints_body
 
     private
 
-    PERMISSIONS_REGEX = /^[0-7]{3,4}$/
-
     def each_resource
       if resources.is_a?(Array)
         resources.each do |r|
           checksum_validator(r[:checksum])
           size_validator(r[:size_in_bytes])
-          mode_validator(r[:mode])
         end
       end
     end
 
-    RESOURCE_ERROR_PREAMBLE = 'array contains at least one resource with'.freeze
+    RESOURCE_ERROR_PREAMBLE = 'array contains at least one resource with a'.freeze
 
     def checksum_validator(checksum)
       unless checksum.is_a?(Hash)
-        errors.add(:resources, "#{RESOURCE_ERROR_PREAMBLE} a non-object checksum") unless errors.added?(
-          :resources, "#{RESOURCE_ERROR_PREAMBLE} a non-object checksum"
+        errors.add(:resources, "#{RESOURCE_ERROR_PREAMBLE} non-object checksum") unless errors.added?(
+          :resources, "#{RESOURCE_ERROR_PREAMBLE} non-object checksum"
         )
         return
       end
 
       unless checksum[:value].is_a?(String)
-        errors.add(:resources, "#{RESOURCE_ERROR_PREAMBLE} a non-string checksum value") unless errors.added?(
-          :resources, "#{RESOURCE_ERROR_PREAMBLE} a non-string checksum value"
+        errors.add(:resources, "#{RESOURCE_ERROR_PREAMBLE} non-string checksum value") unless errors.added?(
+          :resources, "#{RESOURCE_ERROR_PREAMBLE} non-string checksum value"
         )
         return
       end
 
       unless valid_sha1?(checksum[:value])
-        errors.add(:resources, "#{RESOURCE_ERROR_PREAMBLE} a non-SHA1 checksum value") unless errors.added?(
-          :resources, "#{RESOURCE_ERROR_PREAMBLE} a non-SHA1 checksum value"
+        errors.add(:resources, "#{RESOURCE_ERROR_PREAMBLE} non-SHA1 checksum value") unless errors.added?(
+          :resources, "#{RESOURCE_ERROR_PREAMBLE} non-SHA1 checksum value"
         )
+        return
       end
     end
 
     def size_validator(size)
       unless size.is_a?(Integer)
-        errors.add(:resources, "#{RESOURCE_ERROR_PREAMBLE} a non-integer size_in_bytes") unless errors.added?(
-          :resources, "#{RESOURCE_ERROR_PREAMBLE} a non-integer size_in_bytes"
+        errors.add(:resources, "#{RESOURCE_ERROR_PREAMBLE} non-integer size_in_bytes") unless errors.added?(
+          :resources, "#{RESOURCE_ERROR_PREAMBLE} non-integer size_in_bytes"
         )
         return
       end
 
       unless size >= 0
-        errors.add(:resources, "#{RESOURCE_ERROR_PREAMBLE} a negative size_in_bytes") unless errors.added?(
-          :resources, "#{RESOURCE_ERROR_PREAMBLE} a negative size_in_bytes"
-        )
-      end
-    end
-
-    def mode_validator(mode)
-      return if mode.nil?
-
-      unless mode.is_a?(String)
-        errors.add(:resources, "#{RESOURCE_ERROR_PREAMBLE} a non-string mode") unless errors.added?(
-          :resources, "#{RESOURCE_ERROR_PREAMBLE} a non-string mode"
+        errors.add(:resources, "#{RESOURCE_ERROR_PREAMBLE} negative size_in_bytes") unless errors.added?(
+          :resources, "#{RESOURCE_ERROR_PREAMBLE} negative size_in_bytes"
         )
         return
       end
-
-      unless PERMISSIONS_REGEX.match?(mode)
-        errors.add(:resources, "#{RESOURCE_ERROR_PREAMBLE} an incorrect mode") unless errors.added?(
-          :resources, "#{RESOURCE_ERROR_PREAMBLE} an incorrect mode"
-        )
-      end
     end
 
     def valid_sha1?(value)
diff --git a/spec/unit/messages/resource_match_create_message_spec.rb b/spec/unit/messages/resource_match_create_message_spec.rb
index f2f8e486c35..ed3b3d844bd 100644
--- a/spec/unit/messages/resource_match_create_message_spec.rb
+++ b/spec/unit/messages/resource_match_create_message_spec.rb
@@ -166,44 +166,6 @@
         end
       end
 
-      context 'when the v3 mode is not a string' do
-        let(:params) do
-          {
-            resources: [
-              {
-                checksum: { value: '002d760bea1be268e27077412e11a320d0f164d3' },
-                size_in_bytes: 36,
-                mode: 123
-              }
-            ]
-          }
-        end
-
-        it 'has the correct error message' do
-          expect(subject).to be_invalid
-          expect(subject.errors[:resources]).to include('array contains at least one resource with a non-string mode')
-        end
-      end
-
-      context 'when the v3 mode is not a POSIX file permissions string' do
-        let(:params) do
-          {
-            resources: [
-              {
-                checksum: { value: '002d760bea1be268e27077412e11a320d0f164d3' },
-                size_in_bytes: 36,
-                mode: '9876'
-              }
-            ]
-          }
-        end
-
-        it 'has the correct error message' do
-          expect(subject).to be_invalid
-          expect(subject.errors[:resources]).to include('array contains at least one resource with an incorrect mode')
-        end
-      end
-
       context 'when there are multiple validation violations' do
         let(:params) do
           {