Better exception handling

lib/gitlab/ci/secure_files/mobile_provision.rb

@@ -14,24 +14,21 @@ def initialize(filedata)
         end
 
         def decoded_plist
-          @decoded_plist ||= begin
-            p7 = OpenSSL::PKCS7.new(@filedata)
-            p7.verify(nil, OpenSSL::X509::Store.new, nil, OpenSSL::PKCS7::NOVERIFY)
-            p7.data
-          rescue StandardError => err
-            @error = err.to_s
-            nil
-          end
+          p7 = OpenSSL::PKCS7.new(@filedata)
+          p7.verify(nil, OpenSSL::X509::Store.new, nil, OpenSSL::PKCS7::NOVERIFY)
+          p7.data
+        rescue ArgumentError, OpenSSL::PKCS7::PKCS7Error => err
+          @error = err.to_s
+          nil
         end
         strong_memoize_attr :decoded_plist
 
         def properties
-          @properties ||= begin
-            list = CFPropertyList::List.new(data: decoded_plist).value
-            CFPropertyList.native_types(list)
-          rescue CFFormatError
-            nil
-          end
+          list = CFPropertyList::List.new(data: decoded_plist).value
+          CFPropertyList.native_types(list)
+        rescue CFFormatError, CFPlistError, CFTypeError => err
+          @error = err.to_s
+          nil
         end
         strong_memoize_attr :properties
 

spec/lib/gitlab/ci/secure_files/mobile_provision_spec.rb

@@ -58,6 +58,7 @@
       it 'returns nil if the property list fails to be parsed from the decoded plist' do
         allow(subject).to receive(:decoded_plist).and_return('foo/bar')
         expect(subject.properties).to be nil
+        expect(subject.error).to eq('content after root object')
       end
     end