akamai-authtoken 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c1d6b93d6b4ddac65963b2a51b60ad4c003f79a7
-  data.tar.gz: b0c1e74bd7c1b55ceb4f50ea31735a391b9125db
+  metadata.gz: c2f1acf762f72f6892eb2fd69819c4b19eca5e56
+  data.tar.gz: ca26f0256e2ff5cfd4ed4da6b403b36dc1c81328
 SHA512:
-  metadata.gz: 934edf4bc3495870db8fab8aa8b27d7b69daff39fb62da7d40fe9834385986e924d4dae34313d8e03e29486d7acf392d2396d06ec16163b0bba7abd933bbb3e9
-  data.tar.gz: 7a66faa06156f420af5e8c31acdb3740b0a66266c738782dfded6337e923b88be119d242492b38c0ec5a5dc510c0e1061ab25139f2d5893613e6473d0130876c
+  metadata.gz: c1ba618224e2d14f2620c86992c47f8737d0a054360dfa03d6d640b9b60d9a05ab9d00958ddd6f7cc09452d0aa08b786119d8a36fc7a911e6c4c287e5d58fb38
+  data.tar.gz: 5fd23496d859d0ae0813d6e98e60936d9613ba6484aebbcb3b83bca432ccdaeacd5a63420107c95e1befb23899a506b6dee9306060dd3475dade942d5ae61bef

data/lib/akamai/authtoken.rb

@@ -1,3 +1,18 @@
+# Copyright 2017 Akamai Technologies http://developer.akamai.com.
+
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+
+#     http://www.apache.org/licenses/LICENSE-2.0
+
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
 require 'cgi'
 require 'openssl'
 require 'optparse'
@@ -5,6 +20,7 @@ require 'optparse'
 
 ENV['TZ'] = 'GMT'
 
+
 module Akamai
     class AuthTokenError < Exception
         """Base-class for all exceptions raised by AuthToken Class"""
@@ -16,10 +32,14 @@ module Akamai
                 :start_time, :end_time, :window_secondse, :field_delimiter, 
                 :acl_delimiter, :escape_early, :verbose
         
+        @@acl_delimiter = '!'
+        def self.ACL_DELIMITER
+            @@acl_delimiter
+        end
+        
         def initialize(token_type: nil, token_name: '__token__', key: nil,
                 algorithm: 'sha256', salt: nil, start_time: nil, end_time: nil,
-                window_seconds: nil, field_delimiter: '~', acl_delimiter: '!',
-                escape_early: false, verbose: false)
+                window_seconds: nil, field_delimiter: '~', escape_early: false, verbose: false)
 
             @token_type = token_type
             @token_name = token_name
@@ -34,7 +54,6 @@ module Akamai
             @algorithm = algorithm
             @salt = salt
             @field_delimiter = field_delimiter
-            @acl_delimiter = acl_delimiter
             @escape_early = escape_early
             @verbose = verbose
         end
@@ -62,16 +81,35 @@ module Akamai
 
             if start_time.to_s.downcase == 'now'
                 start_time = Time.new.getgm.to_i
-            elsif start_time && !(start_time.is_a? Integer)
-                raise AuthTokenError, 'start_time must be numeric or now'
+            elsif start_time
+                begin
+                    if start_time <= 0
+                        raise AuthTokenError, 'start_time must be ( > 0 )'
+                    end
+                rescue
+                    raise AuthTokenError, 'start_time must be numeric or now'
+                end
+                
             end
 
-            if end_time && !(end_time.is_a? Integer)
-                raise AuthTokenError, 'end_time must be numeric or now'
+            if end_time
+                begin
+                    if end_time <= 0
+                        raise AuthTokenError, 'end_time must be ( > 0 )'
+                    end
+                rescue
+                    raise AuthTokenError, 'end_time must be numeric'
+                end
             end
 
-            if window_seconds && !(window_seconds.is_a? Integer)
-                raise AuthTokenError, 'window_seconds must be numeric or now'
+            if window_seconds
+                begin
+                    if window_seconds <= 0
+                        raise AuthTokenError, 'window_seconds must be ( > 0 )'
+                    end
+                rescue
+                    raise AuthTokenError, 'window_seconds must be numeric'
+                end
             end
 
             if !end_time
@@ -86,7 +124,7 @@ module Akamai
                 end
             end
 
-            if start_time && end_time < start_time
+            if start_time && end_time <= start_time
                 raise AuthTokenError, 'Token will have already expired.'
             end
 
@@ -110,7 +148,7 @@ module Akamai
                 puts "Salt            : #{@salt}"
                 puts "Session ID      : #{session_id}"
                 puts "Field Delimiter : #{@field_delimiter}"
-                puts "ACL Delimiter   : #{@acl_delimiter}"
+                puts "ACL Delimiter   : #{@@acl_delimiter}"
                 puts "Escape Early    : #{@escape_early}"
             end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: akamai-authtoken
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Astin Choi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-09 00:00:00.000000000 Z
+date: 2017-03-17 00:00:00.000000000 Z
 dependencies: []
 description: Akamai-AuthToken is Akamai Authorization Token for Ruby 2.0+
 email: achoi@akamai.com