fastlane-plugin-polidea 0.3.5 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d4d878ea2de616d3e04e82bcd6894449375aa5cc
-  data.tar.gz: 628e99f4d6d61a430bfdd980a89bfce97f7a1c5e
+  metadata.gz: 78b98a3b34d8fbc94f0c870b5d8fce2067a54288
+  data.tar.gz: 1da8c0688b0d59deed751304710b4945ec174c52
 SHA512:
-  metadata.gz: 7214697866060b8b1f6b37d01aedaa48d14ac881ad92d6bb1bfa33eda25da33e08f02c0b9da38756a9897dcc799fcda853712cfe038a639b38ad51dd35cec944
-  data.tar.gz: bad8d331f467ccfc4f77c856c5396077a44b3b3f9a1787f755fdba590f2ccf8d9ac0581de4b5f6b67563291aa55427ffd65966d401e718f8cc4397306d7e8114
+  metadata.gz: d7c32aedd8a994017cf83c9a18451146ad2fcf3afcca44960f3212d32f1eda40087ca0409f0bca2895b40f2db7e78c4f237222010f340356d8d6ee57b7ab05aa
+  data.tar.gz: 39555a300cc4e9805ab037cbe9707c9a870ded3fee2704e29b096d167d5a796878aeaab96f850a18e516344c4aef2a723c7d36208fc7616031e6f86cd9d1885a

data/lib/fastlane/plugin/polidea/actions/polidea_store.rb

@@ -227,7 +227,7 @@ module Fastlane
       private_class_method :create_request
 
       def self.itms_href(plist_url)
-        "itms-services://?action=download-manifest&url=#{CGI.escape(plist_url)}"
+        "itms-services://?action=download-manifest&url=#{URI.encode_www_form_component(plist_url)}"
       end
       private_class_method :itms_href
 

data/lib/fastlane/plugin/polidea/actions/s3.rb

@@ -3,6 +3,7 @@
 # rubocop:disable Metrics/ClassLength
 require 'fastlane/erb_template_helper'
 require 'ostruct'
+require 'securerandom'
 
 module Fastlane
   module Actions
@@ -49,6 +50,7 @@ module Fastlane
         params[:version_template_path] = config[:version_template_path]
         params[:version_file_name] = config[:version_file_name]
         params[:acl] = config[:acl]
+        params[:installation_password] = config[:installation_password]
 
         case platform
         when :ios
@@ -71,6 +73,7 @@ module Fastlane
         icon_file = params[:icon]
         dsym_file = params[:dsym]
         acl = params[:acl]
+        installation_password = params[:installation_password]
 
         validate(params)
         UI.user_error!("No IPA file path given, pass using `ipa: 'ipa path'`") unless ipa_file.to_s.length > 0
@@ -88,7 +91,6 @@ module Fastlane
         url_part = get_url_part(app_name, "ios", bundle_version, build_number)
 
         plist_template_path = params[:plist_template_path]
-        html_template_path = params[:html_template_path]
         html_file_name = params[:html_file_name]
         version_template_path = params[:version_template_path]
         version_file_name = params[:version_file_name]
@@ -147,8 +149,8 @@ module Fastlane
         plist_render = eth.render(plist_template, {
           url: ipa_url,
           ipa_url: ipa_url,
+          app_version: bundle_id,
           build_number: build_number,
-          bundle_id: bundle_id,
           bundle_version: bundle_version,
           title: app_name
         })
@@ -157,13 +159,9 @@ module Fastlane
         icon_url = self.upload_icon(icon_file, url_part, bucket, acl)
 
         # Creates html from template
-        if html_template_path && File.exist?(html_template_path)
-          html_template = eth.load_from_path(html_template_path)
-        else
-          html_template = eth.load_from_path("#{__dir__}/../templates/installation_template.erb")
-        end
-        html_render = eth.render(html_template, {
-          url: "itms-services://?action=download-manifest&url=#{plist_url}",
+        html_render = PageGenerator.generate({
+          url: "itms-services://?action=download-manifest&url=#{URI.encode_www_form_component(plist_url)}",
+          installation_password: installation_password,
           app_version: bundle_version,
           build_number: build_number,
           title: app_name,
@@ -228,6 +226,7 @@ module Fastlane
         apk_file = params[:apk]
         icon_file = params[:icon]
         acl = params[:acl]
+        installation_password = params[:installation_password]
 
         validate(params)
         UI.user_error!("No APK file path given, pass using `apk: 'apk path'`") unless apk_file.to_s.length > 0
@@ -242,7 +241,6 @@ module Fastlane
         app_version = manifest.version_name
         url_part = get_url_part(app_name, "android", app_version, build_number)
 
-        html_template_path = params[:html_template_path]
         html_file_name = params[:html_file_name]
 
         apk_file_basename = File.basename(apk_file)
@@ -266,20 +264,13 @@ module Fastlane
         html_file_name ||= "#{url_part}index.html"
         html_resources_name = "#{url_part}installation-page"
 
-        # grabs module
-        eth = Fastlane::ErbTemplateHelper
-
         # Gets icon from ipa and uploads it
         icon_url = self.upload_icon(icon_file, url_part, bucket, acl)
 
         # Creates html from template
-        if html_template_path && File.exist?(html_template_path)
-          html_template = eth.load_from_path(html_template_path)
-        else
-          html_template = eth.load_from_path("#{__dir__}/../templates/installation_template.erb")
-        end
-        html_render = eth.render(html_template, {
+        html_render = PageGenerator.generate({
           url: apk_url,
+          installation_password: installation_password,
           app_version: app_version,
           build_number: build_number,
           title: app_name,
@@ -314,7 +305,8 @@ module Fastlane
       end
 
       def self.get_url_part(app_name, platform, app_version, build_number)
-        "#{app_name}/#{platform}/#{app_version}_#{build_number}/"
+        random_part = SecureRandom.hex(10)
+        "#{app_name}/#{platform}/#{app_version}_#{build_number}/#{random_part}/"
       end
 
       def self.get_bucket(s3_access_key, s3_secret_access_key, s3_region, s3_bucket)
@@ -507,7 +499,12 @@ module Fastlane
                                        env_name: "S3_ACL",
                                        description: "Uploaded object permissions e.g public_read (default), private, public_read_write, authenticated_read ",
                                        optional: true,
-                                       default_value: "public_read")
+                                       default_value: "public_read"),
+          FastlaneCore::ConfigItem.new(key: :installation_password,
+                                       env_name: "INSTALLATION_PASSWORD",
+                                       description: "Password for installation page",
+                                       optional: true,
+                                       default_value: nil)
         ]
       end
 

data/lib/fastlane/plugin/polidea/helper/page_generator.rb

@@ -0,0 +1,69 @@
+require 'openssl'
+require 'base64'
+require 'json'
+
+module Fastlane
+  module PageGenerator
+    def self.generate(config)
+      if config[:installation_password]
+        generate_private(config)
+      else
+        generate_public(config)
+      end
+    end
+
+    def self.generate_private(config)
+      UI.message("Generating private installation page with password `#{config[:installation_password]}`...")
+      eth = Fastlane::ErbTemplateHelper
+      html_template = eth.load_from_path("#{__dir__}/../templates/secure_installation_template.erb")
+      installation_link, salt, iv = encrypt(config[:url], config[:installation_password])
+      eth.render(html_template, {
+        url: installation_link,
+        salt: salt,
+        iv: iv,
+        app_version: config[:bundle_version],
+        build_number: config[:build_number],
+        title: config[:app_name],
+        app_icon: config[:icon_url],
+        platform: config[:platform]
+      })
+    end
+    private_class_method :generate_private
+
+    def self.generate_public(config)
+      UI.message("Generating public installation page...")
+      eth = Fastlane::ErbTemplateHelper
+      html_template = eth.load_from_path("#{__dir__}/../templates/installation_template.erb")
+      eth.render(html_template, {
+        url: config[:url],
+        app_version: config[:bundle_version],
+        build_number: config[:build_number],
+        title: config[:app_name],
+        app_icon: config[:icon_url],
+        platform: config[:platform]
+      })
+    end
+    private_class_method :generate_public
+
+    def self.encrypt(url, password)
+      salt = OpenSSL::Random.random_bytes(32)
+      iter = 128
+      key_len = 32
+      key = OpenSSL::PKCS5.pbkdf2_hmac_sha1(password, salt, iter, key_len)
+
+      cipher = OpenSSL::Cipher::AES256.new(:CBC)
+      cipher.encrypt
+      cipher.key = key
+
+      random_iv = cipher.random_iv
+      iv = Base64.encode64(random_iv).delete "\n"
+      to_json = { url: url.to_s }.to_json
+      var = cipher.update(to_json.to_s) + cipher.final
+
+      installation_link = Base64.encode64(var).delete "\n"
+      salt = Base64.encode64(salt).delete "\n"
+      return installation_link, salt, iv
+    end
+    private_class_method :encrypt
+  end
+end

data/lib/fastlane/plugin/polidea/templates/installation_template.erb

@@ -35,7 +35,7 @@
             </div>
           </div>
           <div class="small-12 medium-4 medium-offset-2 columns inner-element">
-            <a class="install-button expand" href="<%= url %>" onclick="document.getElementById('finished').id = '';">Install</a>
+            <a class="install-button expand" href="<%= url %>">Install</a>
           </div>
         </div>
       </div>

data/lib/fastlane/plugin/polidea/templates/secure_installation_template.erb

@@ -0,0 +1,134 @@
+<!DOCTYPE html>
+<html>
+<head lang="en">
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Install <%= title %></title>
+
+    <link href='//fonts.googleapis.com/css?family=Open+Sans:300' rel='stylesheet' type='text/css'>
+    <link rel="stylesheet" href="installation-page/css/installation-page.css" type="text/css">
+</head>
+<body class="background">
+        <div class="row section top-section">
+            <div class="small-12 columns">
+                <object type="image/svg+xml" data="/release-resources/img/logo.svg"></object>
+            </div>
+        </div>
+
+        <div class="row section">
+            <div class="small-12 columns">
+                <div id="installation-panel">
+                    <div class="row">
+                        <div class="small-2 medium-2 columns inner-element">
+                            <% if app_icon %>
+                            <img src="<%= app_icon %>" class="no-resize icon-margin"/>
+                            <% else %>
+                            <object type="image/svg+xml" data="/release-resources/img/logo_square.svg"
+                                 class="app-icon no-resize inner-element icon-margin"></object>
+                            <% end %>
+                        </div>
+                        <div class="small-10 columns inner-element" id="app-name">
+                            <div class="app-name-wrapper">
+                                <span class="title text-left"><%= title %></span><br>
+                                <span class="version text-left">Version: <%= app_version %>(<%= build_number %>)</span>
+                                <span class="version text-left">Platform: <%= platform %></span>
+                            </div>
+                        </div>
+
+                        <div class="small-12 columns password-inner-element" id="password">
+                            <form data-abide="ajax" id="myForm">
+                                <div>
+                                  <label>Password <small>required</small>
+                                    <input type="password" required data-abide-validator="passwordValidator" id="password-textfield">
+                                  <small class="error" id="nameError">Password incorrect.</small>
+                                  </label>
+                                </div>
+                              <button type="submit" class="password-button">Submit</button>
+                            </form>
+                        </div>
+
+                        <div class="small-12 medium-4 medium-offset-2 columns inner-element" hidden id="install-button">
+                            <a class="install-button expand" id="installation-link">Install</a>
+                        </div>
+
+
+                    </div>
+                </div>
+            </div>
+        </div>
+
+    <% if release_notes && release_notes.count > 0 %>
+      <div class="row section">
+        <div class="small-12 columns">
+          <span class="whats-new">What's new:</span>
+          <ul>
+            <% for @item in @notes %>
+            <li><%= @item %></li>
+            <% end %>
+          </ul>
+        </div>
+      </div>
+    <% end %>
+
+    <script src="installation-page/js/vendor/pbkdf2.js"></script>
+    <script src="installation-page/js/vendor/enc-base64-min.js"></script>
+    <script src="installation-page/js/vendor/aes.js"></script>
+    <script src="installation-page/js/vendor/jquery.js"></script>
+    <script src="installation-page/js/vendor/fastclick.js"></script>
+    <script src="installation-page/js/foundation.min.js"></script>
+    <script src="installation-page/js/foundation/foundation.abide.js"></script>
+    <script>
+        $(document).foundation({
+            abide: {
+                live_validate : false,
+                focus_on_invalid: false,
+                validators: {
+                    passwordValidator: function (el, required, parent) {
+                        var salt = CryptoJS.enc.Base64.parse("<%= salt %>");
+                        var iv = CryptoJS.enc.Base64.parse("<%= iv %>");
+                        var pass = $(el).val();
+
+                        var key = CryptoJS.PBKDF2(pass, salt, { keySize: 256 / 32, iterations: 128 });
+                        var data = CryptoJS.enc.Base64.parse("<%= url %>");
+
+                        var aesDecryptor = CryptoJS.algo.AES.createDecryptor(key, { iv: iv, mode: CryptoJS.mode.CBC});
+                        var decrypted = aesDecryptor.process(data);
+                        var finalized = aesDecryptor.finalize();
+
+                        try {
+                            var message = decrypted.concat(finalized).toString(CryptoJS.enc.Utf8);
+                            console.log(message);
+
+                            var json = jQuery.parseJSON(message);
+                            console.log(json);
+
+                            if (json['url']) {
+                                $('#installation-link').attr("href", json['url']);
+                                return true;
+                            }
+                        }
+                        catch (err) {
+                            return false;
+                        }
+
+                        return false;
+                    }
+                }
+            }
+        });
+
+        $("#myForm").on("valid.fndtn.abide invalid.fndtn.abide submit.fndtn.abide", function (g) {
+            g.stopPropagation();
+            g.preventDefault();
+            if (g.type === "valid") {
+                console.log(g.type);
+
+                $('#install-button').show();
+                $('#password').hide();
+                $('#app-name').attr("class", "small-10 medium-4 columns inner-element");
+            }
+            return false;
+        });
+    </script>
+</body>
+</html>

data/lib/fastlane/plugin/polidea/version.rb

@@ -1,5 +1,5 @@
 module Fastlane
   module Polidea
-    VERSION = "0.3.5"
+    VERSION = "0.4.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-polidea
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.4.0
 platform: ruby
 authors:
 - Piotrek Dubiel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-06 00:00:00.000000000 Z
+date: 2016-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: plist
@@ -142,6 +142,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -189,6 +203,7 @@ files:
 - lib/fastlane/plugin/polidea/actions/polidea_store.rb
 - lib/fastlane/plugin/polidea/actions/release_notes.rb
 - lib/fastlane/plugin/polidea/actions/s3.rb
+- lib/fastlane/plugin/polidea/helper/page_generator.rb
 - lib/fastlane/plugin/polidea/helper/qr_generator.rb
 - lib/fastlane/plugin/polidea/templates/images/icon-placeholder.png
 - lib/fastlane/plugin/polidea/templates/images/logo.png
@@ -283,6 +298,7 @@ files:
 - lib/fastlane/plugin/polidea/templates/installation-page/sass/normalize.scss
 - lib/fastlane/plugin/polidea/templates/installation_template.erb
 - lib/fastlane/plugin/polidea/templates/mailgun_template.erb
+- lib/fastlane/plugin/polidea/templates/secure_installation_template.erb
 - lib/fastlane/plugin/polidea/version.rb
 homepage: 
 licenses: