webhdfs 0.10.1 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 202827bff28692693795a0b47541acfa5198fdc375401cdcdae0509ac1b01440
-  data.tar.gz: 5b23890cae46ba9363aa3facedd60c083e0bfaf74ba59aae233c866a949ba8bf
+  metadata.gz: 1d66d42e71b87236b2c3724f9d30b282ed01a5bd42ec471a56af560e494ce425
+  data.tar.gz: 9c230c32273448bc62e8359fe0849189e5ffcabb3adf15951c3f0c4614ea2e1c
 SHA512:
-  metadata.gz: 85dc05b030202720b9baf7d4f60232232ff121fff4e7b49a4e6a9fd563df6ccb0293a52f793781aa2d48b2ecd9516e8851eca1b316d002af2dc5d6734dd8a977
-  data.tar.gz: edef2f1401b86df2b57fc253e9418837a331df79c4a5c388f41e5d88755c1a9944689107faaaee65849a6a7c481d0cd9c9df3b4f14b65598ec54f8daa7ef0f49
+  metadata.gz: f034571c3ba98a201df86159e0ab60a8f17359d5f6dc8d761e1a06370f40dd66ce166418d13c4ffe860078a33d528ea11c5c1d558c41d03d637cc89f8a96c698
+  data.tar.gz: b198731f0f369bcd83ba931babe7ec6d145975ef4138eb7c2515ff169c962e64767313bb10668bd73db4d4e1e5e2210ef2da2da406a10d51c53098616875ac82

data/README.md

@@ -102,8 +102,8 @@ Note that net/https and openssl libraries must be available:
 Note that [gssapi](https://github.com/zenchild/gssapi) library must be available:
 
     client = WebHDFS::Client.new('hostname', 14000)
-    # or if you want to use client delegation token with renewing per 8 hours
-    client = WebHDFS::Client.new('hostname', 14000, username, nil, nil, nil, {}, 8)
+    # or if you want to use client delegation token with renewing per 8 hours and delegation token max-lifetime is 7 days
+    client = WebHDFS::Client.new('hostname', 14000, username, nil, nil, nil, {}, 8, 168)
 
     client.kerberos = true
     client.kerberos_keytab = "/path/to/project.keytab"

data/VERSION

@@ -1 +1 @@
-0.10.1
+0.11.0

data/lib/webhdfs/client_v1.rb

@@ -2,7 +2,7 @@ require 'net/http'
 require 'uri'
 require 'json'
 require 'addressable/uri'
-
+require "base64"
 require_relative 'exceptions'
 
 module WebHDFS
@@ -38,7 +38,7 @@ module WebHDFS
       @ssl_verify_mode = mode
     end
 
-    def initialize(host='localhost', port=50070, username=nil, doas=nil, proxy_address=nil, proxy_port=nil, http_headers={}, renew_kerberos_delegation_token_time_hour=nil)
+    def initialize(host='localhost', port=50070, username=nil, doas=nil, proxy_address=nil, proxy_port=nil, http_headers={}, renew_kerberos_delegation_token_time_hour=nil,kerberos_delegation_token_max_lifetime_hour=nil)
       @host = host
       @port = port
       @username = username
@@ -61,21 +61,27 @@ module WebHDFS
       @kerberos = false
       @kerberos_keytab = nil
       @renew_kerberos_delegation_token_time_hour = renew_kerberos_delegation_token_time_hour
+      @kerberos_delegation_token_max_lifetime_hour = kerberos_delegation_token_max_lifetime_hour
       @kerberos_delegation_token = nil
+      @kerberos_token_created_at = Time.now
       @kerberos_token_updated_at = Time.now
       @http_headers = http_headers
     end
 
     def should_kerberos_token_updated?
-      @kerberos_token_updated_at + (@renew_kerberos_delegation_token_time_hour * 60 * 60) <= Time.now
+      (@kerberos_token_updated_at + (@renew_kerberos_delegation_token_time_hour * 60 * 60) <= Time.now) || is_delegation_token_lifetime_expired?
     end
 
+    def is_delegation_token_lifetime_expired?
+      (@kerberos_token_created_at + (@kerberos_delegation_token_max_lifetime_hour * 60 * 60 ) <= Time.now)
+    end
 
     def get_cached_kerberos_delegation_token(force_renew=nil)
       return @kerberos_delegation_token if @kerberos_delegation_token && !should_kerberos_token_updated? && !force_renew
 
-      if !@kerberos_delegation_token || force_renew
+      if !@kerberos_delegation_token || force_renew || is_delegation_token_lifetime_expired?
         @kerberos_delegation_token = get_kerberos_delegation_token(@username)
+        @kerberos_token_created_at = Time.now
         @kerberos_token_updated_at = Time.now
       else
         renew_kerberos_delegation_token(@kerberos_delegation_token)
@@ -428,11 +434,11 @@ module WebHDFS
                     'Response body is empty...'
                   end
 
-        # when delegation token is expired
-        if res.code == '403' and @renew_kerberos_delegation_token_time_hour
+        # when delegation token is invalid
+        if res.code == '403' and @renew_kerberos_delegation_token_time_hour && retries < @retry_times
           if message.include?('{"RemoteException":{')
             detail = JSON.parse(message) rescue nil
-            if detail&.dig('RemoteException', 'exception') == 'InvalidToken' and detail&.dig('RemoteException', 'message')&.include?('HDFS_DELEGATION_TOKEN')
+            if detail&.dig('RemoteException', 'message')&.include?('HDFS_DELEGATION_TOKEN')
               params = params.merge('token' => get_cached_kerberos_delegation_token(true))
               sleep @retry_interval if @retry_interval > 0
               return request(host, port, method, path, op, params, payload, header, retries+1)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: webhdfs
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.11.0
 platform: ruby
 authors:
 - Kazuki Ohta
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-12 00:00:00.000000000 Z
+date: 2024-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -122,7 +122,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Ruby WebHDFS/HttpFs client