zm-ruby-client 0.18.3 → 0.18.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4291a3894ee2caa740aff649e8fdbaa57a55e4091a151ef7695c6d95ee14057d
-  data.tar.gz: 7f3a2333df68c482e0f45fc32c10c60eba17f3c979b6cca9cd59528da1453826
+  metadata.gz: b9fad2347a2f7fa88c1da39a1e3dfdc85598e3dac8e7a060866b58da8fb1aa39
+  data.tar.gz: 30b9161ed034e763748918c47675bd4440eea099bfab0a70d4089691020b7860
 SHA512:
-  metadata.gz: e6a4bc55cffe7887b6cfba72a9185930ab4adb1a654d35b849296189aed6a6a18be49c2b0fdf1a3a238f31afbc63f64679c5b38ac0a2fb9073791df3ee1a80ef
-  data.tar.gz: 3b79c94a2572c6b4ca9939df062a0fd427666aed491f3322372b1d291e47d0d0bd1d178ebb8673fbbf4ed19240ea07cb599a3be25885a916d38c99277028954d
+  metadata.gz: e6cd34015b3ebda5f628f27722d894ef30dc1b7e7cc9500fd91cbb63cf5d138f4aa1197b5681638945cf9c8b63bec5c7e4dbb426b7f3cee2cc11921581693a6f
+  data.tar.gz: 2da81cb383c52918038f3e586e781b6d917ecd356a8414ca0e5aa5616b6d9023689c7dc294fd9194471c474b117cd8f016aef293b1e8ff5433a4d0469bbc9b91

data/lib/zm/client/account/account.rb

@@ -25,10 +25,7 @@ module Zm
   module Client
     # objectClass: zimbraAccount
     class Account < Base::AdminObject
-      # attr_reader :name, :id, :token
-      # attr_writer :home_url
-      # attr_accessor :password, :domainkey, :company, :zimbraCOSId, :zimbraMailHost, :zimbraMailTransport, :carLicense
-      attr_accessor :name, :id, :token, :home_url, :password, :domainkey, :carLicense
+      attr_accessor :name, :id, :token, :home_url, :public_url, :password, :domainkey, :carLicense
 
       def initialize(parent)
         extend(AccountCommon)
@@ -36,18 +33,6 @@ module Zm
         @grantee_type = 'usr'.freeze
       end
 
-      # def init_by_hash(attrs)
-      #   attrs.each do |k, v|
-      #     self.instance_variable_set(arrow_name(k), v)
-      #   end
-      # end
-
-      # def to_h
-      #   hashmap = Hash[all_instance_variable_keys.map { |key| [key, instance_variable_get(arrow_name(key))] }]
-      #   hashmap.delete_if { |_, v| v.nil? }
-      #   hashmap
-      # end
-
       def all_instance_variable_keys
         AccountCommon::ZM_ACCOUNT_ATTRS
       end
@@ -107,6 +92,10 @@ module Zm
         @domainkey ||= @parent.domain_key(domain_name)
       end
 
+      def domain_key=(key)
+        @domainkey = key
+      end
+
       def infos
         @infos || read_infos
       end

data/lib/zm/client/connector/rest_account.rb

@@ -7,49 +7,70 @@ module Zm
 
       def initialize
         @verbose = false
+        @cookies = nil
         @follow_location = true
-        @curl = easy_curl
       end
 
       def verbose!
         @verbose = true
-        @curl.verbose = @verbose
       end
 
-      def cookie(cookie)
-        @curl.headers['Cookie'] = cookie
+      def cookies(cookies)
+        @cookies = cookies
       end
 
       def download(url, dest_file_path)
-        @curl.url = URI.escape(url)
+        curl = init_curl_client(url)
+
         File.open(dest_file_path, 'wb') do |f|
-          @curl.on_body do |data|
+          curl.on_body do |data|
             f << data
             data.size
           end
-          @curl.perform
+
+          curl.perform
+        end
+
+        if curl.status.to_i >= 400
+          File.unlink(dest_file_path) if File.exist?(dest_file_path)
+
+          message = "Download failure: #{curl.body_str} (status=#{curl.status})"
+          close_curl(curl)
+          raise RestError, message
         end
+
+        dest_file_path
       end
 
       def upload(url, src_file_path)
-        @curl.url = URI.escape(url)
-        @curl.http_post(Curl::PostField.file('file', src_file_path))
+        curl = init_curl_client(url)
+
+        curl.http_post(Curl::PostField.file('file', src_file_path))
 
-        if @curl.status.to_i >= 400
+        if curl.status.to_i >= 400
           messages = [
             "Upload failure ! #{src_file_path}",
-            extract_title(@curl.body_str)
+            extract_title(curl.body_str)
           ].compact
+          close_curl(curl)
           raise RestError, messages.join("\n")
         end
 
-        @curl.body_str
+        str = curl.body_str
+        close_curl(curl)
+        str
       end
 
       private
 
-      def easy_curl
-        Curl::Easy.new do |curl|
+      def close_curl(curl)
+        curl.close
+        # force process to kill socket
+        GC.start
+      end
+
+      def init_curl_client(url)
+        ::Curl::Easy.new(url) do |curl|
           curl.timeout = 300
           curl.enable_cookies = false
           curl.encoding = ''
@@ -58,6 +79,8 @@ module Zm
           curl.multipart_form_post = true
           curl.verbose = verbose
           curl.follow_location = follow_location
+          curl.verbose = @verbose
+          curl.cookies = @cookies
         end
       end
 

data/lib/zm/client/connector/soap_base.rb

@@ -20,40 +20,51 @@ module Zm
         extend(ZmLogger)
         @verbose = false
         @uri = URI::HTTP.new(scheme, nil, host, port, nil, soap_path, nil, nil, nil)
-        init_curl_client
       end
 
       def verbose!
         @verbose = true
-        @curl.verbose = @verbose
       end
 
       private
 
       def init_curl_client
-        @curl = ::Curl::Easy.new(@uri.to_s) do |curl|
+        ::Curl::Easy.new(@uri.to_s) do |curl|
           curl.timeout = 300
           curl.enable_cookies = false
           curl.encoding = ''
           curl.headers = HTTP_HEADERS
           curl.ssl_verify_peer = false
           curl.ssl_verify_host = 0
-          # curl.verbose = @verbose
+          curl.verbose = @verbose
         end
       end
 
       def curl_request(body, error_handler = SoapError)
+        curl = init_curl_client
         logger.debug body.to_json
-        @curl.http_post(body.to_json)
+        curl.http_post(body.to_json)
 
-        logger.debug @curl.body_str
+        logger.debug curl.body_str
 
-        soapbody = JSON.parse(@curl.body_str, symbolize_names: true)
-        raise(error_handler, soapbody) if @curl.status.to_i >= 400
+        soapbody = JSON.parse(curl.body_str, symbolize_names: true)
+
+        if curl.status.to_i >= 400
+          close_curl(curl)
+          raise(error_handler, soapbody)
+        end
+
+        close_curl(curl)
 
         soapbody
       end
 
+      def close_curl(curl)
+        curl.close
+        # force process to kill socket
+        GC.start
+      end
+
       def hash_header(token, target_server = nil)
         context = { authToken: token, userAgent: { name: :zmsoap }, targetServer: target_server }.delete_if do |_, v|
           v.nil?

data/lib/zm/client/domain/domain.rb

@@ -7,7 +7,7 @@ module Zm
       INSTANCE_VARIABLE_KEYS = %i[name description zimbraDomainName zimbraDomainStatus zimbraId zimbraDomainType
         zimbraDomainDefaultCOSId zimbraGalAccountId zimbraPreAuthKey zimbraGalLdapBindDn zimbraGalLdapBindPassword
         zimbraGalLdapFilter zimbraGalLdapSearchBase zimbraGalLdapURL zimbraGalMode zimbraMailTransport
-        zimbraPublicServiceHostname zimbraPublicServiceProtocol]
+        zimbraPublicServiceHostname zimbraPublicServiceProtocol zimbraVirtualHostname]
 
       attr_accessor *INSTANCE_VARIABLE_KEYS
 
@@ -16,12 +16,6 @@ module Zm
         @grantee_type = 'dom'.freeze
       end
 
-      # def to_h
-      #   hashmap = Hash[all_instance_variable_keys.map { |key| [key, instance_variable_get(arrow_name(key))] }]
-      #   hashmap.delete_if { |_, v| v.nil? }
-      #   hashmap
-      # end
-
       def all_instance_variable_keys
         INSTANCE_VARIABLE_KEYS
       end
@@ -51,6 +45,10 @@ module Zm
         end
       end
 
+      def modify!
+        false
+      end
+
       def accounts
         @accounts ||= DomainAccountsCollection.new(self)
       end
@@ -59,11 +57,6 @@ module Zm
         sac.generic_delete(:DeleteDomainRequest, id)
       end
 
-      # def account_quotas(server_id)
-      #   rep = sac.get_quota_usage(name, nil, nil, nil, nil, nil, nil, server_id)
-      #   AccountsBuilder.new(@parent, rep).make
-      # end
-
       def init_from_json(json)
         super(json)
         return unless json[:a].is_a? Array

data/lib/zm/client/mountpoint/mountpoint.rb

@@ -12,8 +12,7 @@ module Zm
         webOfflineSyncDays color rgb
       ].freeze
 
-      attr_reader :owner, :rev, :reminder, :ms, :deletable, :rid, :uuid, :url, :f, :broken, :luuid, :ruuid, :activesyncdisabled, :absFolderPath, :zid, :id, :webOfflineSyncDays
-      attr_writer :view, :zid, :rid
+      attr_accessor :owner, :rev, :reminder, :ms, :deletable, :rid, :uuid, :url, :f, :broken, :luuid, :ruuid, :activesyncdisabled, :absFolderPath, :zid, :id, :webOfflineSyncDays, :view, :zid, :rid
 
       define_changed_attributes :name, :color, :rgb, :l
 

data/lib/zm/client/version.rb

@@ -10,7 +10,7 @@ module Zm
     module VERSION
       MAJOR = 0
       MINOR = 18
-      TINY  = 3
+      TINY  = 5
 
       STRING = [MAJOR, MINOR, TINY].compact.join('.')
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zm-ruby-client
 version: !ruby/object:Gem::Version
-  version: 0.18.3
+  version: 0.18.5
 platform: ruby
 authors:
 - Maxime Désécot
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-31 00:00:00.000000000 Z
+date: 2024-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -264,7 +264,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.4.19
 signing_key:
 specification_version: 4
 summary: zm-ruby-client