zendesk_apps_support 4.21.4 → 4.22.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: ceadbe45fb4dee886f38f028f360bbfb821fd5b5
-  data.tar.gz: 7c3a0f1c9b455bfbee462cf8e6bf060234eb8e13
+SHA256:
+  metadata.gz: f5e7624f0698a1aff9b173819bca559434dd3baffe49e9fa4d7276867dbed41f
+  data.tar.gz: b98003482ec9bb0b011d228d61a9385df451ea569c71fd775eccafb30e731b23
 SHA512:
-  metadata.gz: 3982cda3beb2391adb7cdc265f4a27aca924c3f43975fa1504a4e43e5b1651ef82bd6eb991fc8988e496b6d07387a720f70337a26bf8c93eb96144d5ebd4f2e4
-  data.tar.gz: 556e814c43f2232105db940077adc3f95b71d5cf1087717655aa3288a0238c3bdec3952f5d666a45670508eb0626debf45fbe7768aaccdc22f7f5fa06c529211
+  metadata.gz: e4b9b3fd92f5fc1de2198f99e8442de953f4e23e77833cb8a67e0100c5fdefc01f98662c6377112f08ca9daf7eb04fb4b9c924406ce9bbd5d01fe3faa1532d29
+  data.tar.gz: 518d3295fca2a66d0035e1c2a6859db891b2ac3d6cb6548bd98f1638bc0311616369f25bcfb8ce8530ac503adde61ca65f05de414728f972ed36a9b7bd56a50c

data/README.md

@@ -9,10 +9,16 @@ This repo is owned and maintained by the Zendesk Apps team. You can reach us on
 ## Getting Started
 When you want to help **develop** this tool, you will need to clone this repo.
 
+Since ZAS is used in ZAT, which supports Ruby 2.1, the Bundler Gem Version 1.17.3 is required for bundling dependencies. If you are working with a version that is higher than `1.17.3`, you will need to downgrade it.
+```
+  $ gem install bundler --version 1.17.3
+  $ bundle install
+```
+
 Very likely you want to try out your changes with the use of ZAT. See [ZAT](https://github.com/zendesk/zendesk_apps_tools/) for how to get ZAT/ZAS in development.
 
 ## Testing
-This project uses rspec, which can be run with `bundle exec rake`.
+This project uses Rspec, which can be run with `bundle exec rake`.
 
 ## Contribute
 * Put up a PR into the master branch.

data/lib/zendesk_apps_support/validations/requests.rb

@@ -12,45 +12,70 @@ module ZendeskAppsSupport
         def call(package)
           errors = []
           files = package.js_files + package.html_files
+          private_app = package.manifest.private?
 
           files.each do |file|
             file_content = file.read
 
             http_protocol_urls = find_address_containing_http(file_content)
             if http_protocol_urls.any?
-              package.warnings << I18n.t(
-                'txt.apps.admin.warning.app_build.insecure_http_request',
-                uri: http_protocol_urls.join(I18n.t('txt.apps.admin.error.app_build.listing_comma')),
-                file: file.relative_path
+              package.warnings << insecure_http_requests_warning(
+                http_protocol_urls,
+                file.relative_path
               )
             end
 
             ip_addresses = file_content.scan(IP_ADDRESS)
-            if ip_addresses.any?
-              errors << blocked_ips_validation(file.relative_path, ip_addresses)
-            end
+            next unless ip_addresses.any?
+
+            ip_validation_messages = ip_validation_messages(
+              file.relative_path,
+              ip_addresses,
+              private_app
+            )
+
+            validation_group = private_app ? package.warnings : errors
+            validation_group << ip_validation_messages
           end
 
+          package.warnings.flatten!
           errors
         end
 
         private
 
-        def blocked_ips_validation(file_path, ip_addresses)
-          ip_addresses.each_with_object([]) do |ip_address, error_messages|
-            blocked_type = blocked_ip_type(ip_address)
-            next unless blocked_type
+        def ip_validation_messages(file_path, ip_addresses, private_app)
+          ip_addresses.each_with_object([]) do |ip_address, messages|
+            ip_type_string = ip_type_string(ip_address)
+            next unless ip_type_string
 
-            error_messages << ValidationError.new(
-              :blocked_request,
-              type: blocked_type,
-              uri:  ip_address,
-              file: file_path
-            )
+            string_params = {
+              type: ip_type_string, uri: ip_address, file: file_path
+            }
+            validation_message =
+              if private_app
+                I18n.t('txt.apps.admin.error.app_build.blocked_request', string_params)
+              else
+                ValidationError.new(:blocked_request, string_params)
+              end
+
+            messages << validation_message
           end
         end
 
-        def blocked_ip_type(ip_address)
+        def insecure_http_requests_warning(http_protocol_urls, relative_path)
+          http_protocol_urls = http_protocol_urls.join(
+            I18n.t('txt.apps.admin.error.app_build.listing_comma')
+          )
+
+          I18n.t(
+            'txt.apps.admin.warning.app_build.insecure_http_request',
+            uri: http_protocol_urls,
+            file: relative_path
+          )
+        end
+
+        def ip_type_string(ip_address)
           block_type =
             case IPAddress.parse(ip_address)
             when proc(&:private?) then 'private'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zendesk_apps_support
 version: !ruby/object:Gem::Version
-  version: 4.21.4
+  version: 4.22.0
 platform: ruby
 authors:
 - James A. Rosen
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-03 00:00:00.000000000 Z
+date: 2019-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -237,6 +237,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 9.0.6
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.17.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.17.3
 description: Support to help you develop Zendesk Apps.
 email:
 - dev@zendesk.com
@@ -305,8 +319,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Support to help you develop Zendesk Apps.