MuranoCLI 3.2.0.beta.1 → 3.2.0.beta.5

data/lib/MrMurano/Webservice-File.rb

@@ -5,14 +5,16 @@
 # vim:tw=0:ts=2:sw=2:et:ai
 # Unauthorized copying of this file is strictly prohibited.
 
+require 'digest/md5'
 require 'digest/sha1'
 require 'http/form_data'
 require 'mime/types'
 require 'net/http'
 require 'pathname'
 require 'uri'
-require 'MrMurano/Webservice'
+require 'MrMurano/http'
 require 'MrMurano/SyncRoot'
+require 'MrMurano/Webservice'
 
 module MrMurano
   module Webservice
@@ -20,12 +22,18 @@ module MrMurano
     class File < WebserviceBase
       # File Specific details on an Item
       class FileItem < Item
+        # For the source of truth of the API response, see:
+        #   pegasus_registry/services/asset.yaml
         # @return [String] path for URL maps to this static file
         attr_accessor :path
         # @return [String] The MIME-Type for this content
         attr_accessor :mime_type
         # @return [String] Checksum for the content.
         attr_accessor :checksum
+        # @return [String] MD5 checksum of the stored file. (Same as :checksum.)
+        attr_accessor :md5
+        # @return [Integer] Size in bytes of the stored file.
+        attr_accessor :size
       end
 
       def initialize
@@ -56,7 +64,7 @@ module MrMurano
 
       ##
       # Get one item of the static content.
-      def fetch(path, &block)
+      def fetch(path, _untainted=false, &block)
         path = path[1..-1] if path[0] == '/'
         path = '/' + URI.encode_www_form_component(path)
         get(path) do |request, http|
@@ -93,21 +101,47 @@ module MrMurano
         super(request) if request.method != 'PUT'
       end
 
-      ##
-      # Upload a file
-      # @param src [Pathname] Full path of where to upload from
-      # @param item [Hash] The item details to upload
-      # @param modify [Boolean] True if item exists already and this is changing it
-      def upload(local, remote, _modify)
+      def ensure_nonempty_upload(local)
+        # FIXME/MUR-6479/MUR-6477: (lb): Remove this function when backend fixed.
+        #
+        #     {"statusCode":400,
+        #      "message":"The \"data\" argument must be one of type
+        #        string, TypedArray, or DataView",
+        #      "code":"BadRequestError"
+        #     }
         local = Pathname.new(local) unless local.is_a? Pathname
+        if !local.size.zero?
+          yield local
+        else
+          # Cannot use Tempfile.open because it make filename unique, e.g.,
+          #   Tempfile.open(local.basename.to_s) { |tmpf| puts tmpf.path }
+          #   # /tmp/index.html20180413-15436-5i0s0u
+          Dir.mktmpdir do |tmpdir|
+            # NOTE: Because our class is named File, we have to descope ::File.
+            ::File.open(::File.join(tmpdir, local.basename.to_s), 'w') do |tmpf|
+              tmpf << "\n"
+              tmpf.flush
+              local = Pathname.new(tmpf.path)
+              yield local
+            end
+          end
+        end
+      end
 
+      def prepare_upload_req(remote)
         path = remote[:path]
         path = path[1..-1] if path[0] == '/'
+        # JANKIE: The endpoint ends in /file, and this makes it /fileupload/, ha!
         uri = endpoint('upload/' + URI.encode_www_form_component(path))
         # kludge past for a bit.
-        #`curl -s -H 'Authorization: token #{@token}' '#{uri.to_s}' -F file=@#{local.to_s}`
+        #`curl -s -H 'Authorization: token #{@token}' '#{uri.to_s}' \
+        #  -F file=@#{local.to_s}`
+        Net::HTTP::Put.new(uri)
+      end
 
-        # http://stackoverflow.com/questions/184178/ruby-how-to-post-a-file-via-http-as-multipart-form-data
+      def prepare_upload_form(local, remote)
+        # http://stackoverflow.com/questions/184178/
+        #   ruby-how-to-post-a-file-via-http-as-multipart-form-data
         #
         # Look at: https://github.com/httprb/http
         # If it works well, consider porting over to it.
@@ -116,36 +150,53 @@ module MrMurano
         #
         # Most of these pull into ram.  So maybe just go with that. Would guess that
         # truely large static content is rare, and we can optimize/fix that later.
-
         file = HTTP::FormData::File.new(local.to_s, content_type: remote[:mime_type])
-        form = HTTP::FormData.create(file: file)
-        req = Net::HTTP::Put.new(uri)
+        HTTP::FormData.create(file: file)
+      end
+
+      def dump_upload_curl(request, local)
+        a = []
+        a << %(curl -s -H 'Authorization: #{request['authorization']}')
+        a << %(-H 'User-Agent: #{request['User-Agent']}')
+        a << %(-X #{request.method})
+        a << %('#{request.uri}')
+        a << %(-F file=@#{local})
+        ccmd = a.join(' ')
+        MrMurano::Http.curldebug_log(ccmd, stamp_it: true)
+      end
+
+      ##
+      # Upload a file
+      # @param src [Pathname] Full path of where to upload from
+      # @param item [Hash] The item details to upload
+      # @param modify [Boolean] True if item exists and this is changing it
+      def upload(local, remote, _modify)
+        local = Pathname.new(local) unless local.is_a? Pathname
+        request, response = try_upload(local, remote)
+        return if response.nil?
+        if response.is_a?(Net::HTTPBadRequest) && local.size.zero?
+          ensure_nonempty_upload(local) do |nonempty_local|
+            request, response = try_upload(nonempty_local, remote)
+          end
+        end
+        return if response.is_a?(Net::HTTPSuccess)
+        showHttpError(request, response)
+      end
+
+      def try_upload(local, remote)
+        req = prepare_upload_req(remote)
+        form = prepare_upload_form(local, remote)
         add_headers(req)
 
-        return unless upload_item_allowed(remote[@itemkey])
+        return [nil, nil] unless upload_item_allowed(remote[@itemkey])
 
         workit(req) do |request, http|
           request.content_type = form.content_type
           request.content_length = form.content_length
           request.body = form.to_s
-
-          if $cfg['tool.curldebug']
-            a = []
-            a << %(curl -s -H 'Authorization: #{request['authorization']}')
-            a << %(-H 'User-Agent: #{request['User-Agent']}')
-            a << %(-X #{request.method})
-            a << %('#{request.uri}')
-            a << %(-F file=@#{local})
-            if $cfg.curlfile_f.nil?
-              puts a.join(' ')
-            else
-              $cfg.curlfile_f << a.join(' ') + "\n\n"
-              $cfg.curlfile_f.flush
-            end
-          end
-
+          dump_upload_curl(request, local) if $cfg['tool.curldebug']
           response = http.request(request)
-          showHttpError(request, response) unless response.is_a?(Net::HTTPSuccess)
+          [request, response]
         end
       end
 
@@ -153,6 +204,7 @@ module MrMurano
       # @param itemkey [Symbol] Key for look up.
       def tolocalname(item, key)
         name = item[key]
+        # If service says '/', assume filename is e.g., 'index.html'.
         name = $cfg['files.default_page'] if name == '/'
         name
       end
@@ -168,20 +220,28 @@ module MrMurano
 
         mime = MIME::Types.type_for(path.to_s)[0] || MIME::Types['application/octet-stream'][0]
 
-        # It does not actually take the SHA1 of the file.
-        # It first converts the file to hex, then takes the SHA1 of that string
-        #sha1 = Digest::SHA1.file(path.to_s).hexdigest
-        sha1 = Digest::SHA1.new
-        path.open('rb:ASCII-8BIT') do |io|
-          # rubocop:disable Lint/AssignmentInCondition
-          # "Assignment in condition - you probably meant to use ==."
-          while chunk = io.read(1_048_576)
-            sha1 << Digest.hexencode(chunk)
+        # FIXME/2018-04-13: (lb): When did platform switch from SHA1 to MD5?
+        #   Leaving this dead code block as a reminder to verify the new
+        #   behavior is the intended behavior.
+        xsum_is_sha1 = false
+        if xsum_is_sha1
+          # It does not actually take the SHA1 of the file.
+          # It first converts the file to hex, then takes the SHA1 of that string
+          #xsum = Digest::SHA1.file(path.to_s).hexdigest
+          xsum = Digest::SHA1.new
+          path.open('rb:ASCII-8BIT') do |io|
+            # rubocop:disable Lint/AssignmentInCondition
+            # "Assignment in condition - you probably meant to use ==."
+            while chunk = io.read(1_048_576)
+              xsum << Digest.hexencode(chunk)
+            end
           end
+        else
+          xsum = Digest::MD5.file(path.to_s)
         end
-        debug "Checking #{name} (#{mime.simplified} #{sha1.hexdigest})"
+        debug "Checking #{name} (#{mime.simplified} #{xsum.hexdigest})"
 
-        FileItem.new(path: name, mime_type: mime.simplified, checksum: sha1.hexdigest)
+        FileItem.new(path: name, mime_type: mime.simplified, checksum: xsum.hexdigest)
       end
 
       # @param item [FileItem] The item to get a key from
@@ -202,4 +262,4 @@ module MrMurano
     SyncRoot.instance.add('assets', File, 'A', true, %w[files])
   end
 end
-#  vim: set ai et sw=2 ts=2 :
+

data/lib/MrMurano/commands/domain.rb

@@ -8,6 +8,7 @@
 require 'MrMurano/ReCommander'
 require 'MrMurano/Solution'
 require 'MrMurano/commands/solution'
+require 'MrMurano/commands/solution_picker'
 
 command :domain do |c|
   c.syntax = %(murano domain)