zm-ruby-client 2.0.5 → 2.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2922ec4ff3ece6b82feeee37bd6ec363824f822e884df6e5a9eafb87953f3e10
-  data.tar.gz: 6139bad6da17e8dcbb042af4060410ea83ea94ff63b9b0b6ee92a437d46d36c6
+  metadata.gz: 13a8f6a25daf14d60d491a527f7b9b71920afe9e5df79cbb60bceeacdbdcd606
+  data.tar.gz: f3e41e0e600c97ab87a0198bb69e305ba7e12e07d9235ae57ff2e5f6d8457e21
 SHA512:
-  metadata.gz: 21213f0d951333e67a030a97f06fb5a578e8970cc080749bc6bb4aa2ecc28d0736686f26879ccafb8404a7ade34230231435195dd262f8f1ed6ea5bbf74c9bc8
-  data.tar.gz: 48c3570bb2b80842b66d01a14c586b4e00e2b78bd2d0eaaebbbc818b17304af62d264e8b1255673d8bf2206e0da959ed9e08883d01abfe3b28b1f5ea1f62544e
+  metadata.gz: 38457fc1f124a1970240edbe7ee900ba02b1c9a864306c03335318eff0c106b27a16cf6598bcc3b1f931904eff7f6de31834f125a69a4177cba07aef86ca6ea7
+  data.tar.gz: 2d4491d26f0c59c8b2bc36c9f7f1ac183a3d00b06abf749005442dd67ef5fa17674f1fcd36a7bb4ae23c73a23a157f1f3a063427b938ddc7a9decda724967653

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

@@ -7,34 +7,35 @@ module Zm
 
       def initialize
         @verbose = false
+        @cookies = nil
         @follow_location = true
-        @curl = easy_curl
       end
 
       def verbose!
         @verbose = true
-        @curl.verbose = @verbose
       end
 
       def cookies(cookies)
-        @curl.cookies = cookies
+        @cookies = cookies
       end
 
       def download(url, dest_file_path)
-        @curl.url = 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
+        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})"
+          message = "Download failure: #{curl.body_str} (status=#{curl.status})"
+          close_curl(curl)
           raise RestError, message
         end
 
@@ -42,24 +43,34 @@ module Zm
       end
 
       def upload(url, src_file_path)
-        @curl.url = 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 = ''
@@ -68,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

@@ -23,12 +23,10 @@ module Zm
         @verbose = false
         @uri = URI::HTTP.new(scheme, nil, host, port, nil, soap_path, nil, nil, nil)
         @context = SoapContext.new
-        init_curl_client
       end
 
       def verbose!
         @verbose = true
-        @curl.verbose = @verbose
       end
 
       def invoke(soap_element, error_handler = SoapError)
@@ -45,28 +43,42 @@ module Zm
       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
         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 envelope(soap_element)
         {
           Body: soap_element.to_hash,

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

@@ -58,6 +58,22 @@ module Zm
         @parent.zimbra_attributes.all_domain_attrs_writable_names
       end
 
+      def DKIMPublicTxt
+        return if self.DKIMPublicKey.nil?
+        return @DKIMPublicTxt if @DKIMPublicTxt
+
+        txt = self.DKIMPublicKey.each_line.map do |line|
+          line.chomp!
+          line.gsub!('"', '')
+          line.strip!
+        end.join
+
+        matches = txt.scan(/\((.*)\)/)
+        return if matches.first.nil?
+
+        @DKIMPublicTxt = matches.first.first.strip
+      end
+
       private
 
       def do_update!(hash)

data/lib/zm/client/version.rb

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

data/lib/zm/modules/common/zimbra-attrs.json

@@ -30,4 +30,10 @@
 {"id":"MD060","name":"zimbraWebClientMaxInputBufferLength","type":"cstring","cardinality":"single","requiredIn":"domain"},
 {"id":"MD061","name":"zimbraWebClientStaySignedInDisabled","type":"cstring","cardinality":"single","requiredIn":"domain"},
 {"id":"MD062","name":"zimbraWebClientSupportedHelps","type":"cstring","cardinality":"single","requiredIn":"domain"},
-{"id":"MD063","name":"zimbraZimletDataSensitiveInMixedModeDisabled","type":"cstring","cardinality":"single","requiredIn":"domain"}]
+{"id":"MD063","name":"zimbraZimletDataSensitiveInMixedModeDisabled","type":"cstring","cardinality":"single","requiredIn":"domain"},
+{"id":"MD064","name":"DKIMDomain","type":"cstring","cardinality":"single","requiredIn":"domain"},
+{"id":"MD065","name":"DKIMIdentity","type":"cstring","cardinality":"single","requiredIn":"domain"},
+{"id":"MD066","name":"DKIMKey","type":"cstring","cardinality":"single","requiredIn":"domain"},
+{"id":"MD067","name":"DKIMPublicKey","type":"cstring","cardinality":"single","requiredIn":"domain"},
+{"id":"MD068","name":"DKIMSelector","type":"cstring","cardinality":"single","requiredIn":"domain"}
+]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zm-ruby-client
 version: !ruby/object:Gem::Version
-  version: 2.0.5
+  version: 2.0.6
 platform: ruby
 authors:
 - Maxime Désécot
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-08 00:00:00.000000000 Z
+date: 2024-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable