akamai-edgeauth 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 83c736a708b2fb20a392c036e30bcd54ca622190
-  data.tar.gz: aa2f7d5c9b23ce48c09428afc23eedf9fa183b4a
+  metadata.gz: 972a9f038408d8bc267683e7199b6c85b3c61b61
+  data.tar.gz: a9894996173a88191e669ab6d49c44b33da5956a
 SHA512:
-  metadata.gz: c22efda1440facf518e3f6ae61409b10ae6b52f23d5724acf07cdd35d1d0601c6a2424e8faa4d4f772ad78172c5bdec151e0fea3ad019de2070d3369bef8825e
-  data.tar.gz: 15dea57f6d38d873b3c5e7b30e243f8f543ea220bebd3cce3e9e8a73ea22bc231dbfc3de1f3db7612aa7b07c7a78ea6e1e376ab3d67666ad2606d1c4f22e92a1
+  metadata.gz: 023fdd09d3000b585c61480ba5e3aac04eae4ce613f377f2a6e5371b83515267b7228e2456bad01803d5c1df9ece7eed93ba2978959a8c30f4e00485985ee975
+  data.tar.gz: 6e720ca2f55c1dff666fe0a5c462474d1757287718b0538cbf408fb38bfc02b43974f4a89ec3efe29b3ab8deaa9a879955663eae6c613a37ab9c538e65684a6d

data/lib/akamai/edgeauth.rb

@@ -1,4 +1,4 @@
-# Copyright 2017 Akamai Technologies http://developer.akamai.com.
+# Copyright 2018 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.
@@ -28,32 +28,34 @@ module Akamai
 
 
     class EdgeAuth
-        attr_accessor :token_type, :token_name, :key, :algorithm, :salt, 
-                :start_time, :end_time, :window_secondse, :field_delimiter, 
-                :acl_delimiter, :escape_early, :verbose
+        attr_accessor :token_type, :token_name, :key, :algorithm, :salt,
+                :ip, :payload, :session_id, :start_time, :end_time, 
+                :window_seconds, :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: '~', escape_early: false, verbose: false)
-
+        def initialize(token_type: nil, token_name: '__token__', 
+                key: nil, algorithm: 'sha256', salt: nil,
+                ip: nil, payload: nil, session_id: nil,
+                start_time: nil, end_time: nil, window_seconds: nil, 
+                field_delimiter: '~', acl_delimiter: '!', 
+                escape_early: false, verbose: false)
             @token_type = token_type
             @token_name = token_name
-            @start_time = start_time
-            @end_time = end_time
-            @window_seconds = window_seconds
             if !key || key.length <= 0
                 raise EdgeAuthError, 
                     'You must provide a secret in order to generate a new token.'
             end
             @key = key
-            @algorithm = algorithm
             @salt = salt
+            @algorithm = algorithm
+            @ip = ip
+            @payload = payload
+            @session_id = session_id
+            @start_time = start_time
+            @end_time = end_time
+            @window_seconds = window_seconds
             @field_delimiter = field_delimiter
+            @acl_delimiter = acl_delimiter
             @escape_early = escape_early
             @verbose = verbose
         end
@@ -66,18 +68,9 @@ module Akamai
             end
         end
 
-        def generateToken(url: nil, acl: nil, start_time: nil, end_time: nil, window_seconds: nil,
-                        ip: nil, payload: nil, session_id: nil)
-            
-            if !start_time
-                start_time = @start_time
-            end
-            if !end_time
-                end_time = @end_time
-            end
-            if !window_seconds
-                window_seconds = @window_seconds
-            end
+        def _generateToken(path, isUrl)
+            start_time = @start_time
+            end_time = @end_time
 
             if start_time.to_s.downcase == 'now'
                 start_time = Time.new.getgm.to_i
@@ -102,9 +95,9 @@ module Akamai
                 end
             end
 
-            if window_seconds
+            if @window_seconds
                 begin
-                    if window_seconds <= 0
+                    if @window_seconds <= 0
                         raise EdgeAuthError, 'window_seconds must be ( > 0 )'
                     end
                 rescue
@@ -113,11 +106,11 @@ module Akamai
             end
 
             if !end_time
-                if window_seconds
+                if @window_seconds
                     if !start_time
-                        end_time = Time.new.getgm.to_i + window_seconds
+                        end_time = Time.new.getgm.to_i + @window_seconds
                     else
-                        end_time = start_time + window_seconds
+                        end_time = start_time + @window_seconds
                     end
                 else
                     raise EdgeAuthError, 'You must provide an expiration time or a duration window..'
@@ -128,27 +121,22 @@ module Akamai
                 raise EdgeAuthError, 'Token will have already expired.'
             end
 
-            if (!acl && !url) || (acl && url)
-                raise EdgeAuthError, 'You must provide a URL or an ACL'
-            end
-
             if @verbose
                 puts "Akamai Token Generation Parameters"
                 puts "Token Type      : #{@token_type}"
                 puts "Token Name      : #{@token_name}"
                 puts "Start Time      : #{start_time}"
                 puts "End Time        : #{end_time}"
-                puts "Window(seconds) : #{window_seconds}"
-                puts "IP              : #{ip}"
-                puts "URL             : #{url}"
-                puts "ACL             : #{acl}"
+                puts "Window(seconds) : #{@window_seconds}"
+                puts "IP              : #{@ip}"
+                puts "URL/ACL         : #{path}"
                 puts "Key/Secret      : #{@key}"
-                puts "Payload         : #{payload}"
+                puts "Payload         : #{@payload}"
                 puts "Algo            : #{@algo}"
                 puts "Salt            : #{@salt}"
-                puts "Session ID      : #{session_id}"
+                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
 
@@ -163,8 +151,8 @@ module Akamai
             end
             new_token.push('exp=%s' % end_time)
 
-            if acl
-                new_token.push('acl=%s' % acl)
+            if !isUrl
+                new_token.push('acl=%s' % path)
             end
             if session_id
                 new_token.push('id=%s' % _escapeEarly(session_id))
@@ -175,8 +163,8 @@ module Akamai
 
             hash_code = new_token.clone
             
-            if url and !acl
-                hash_code.push('url=%s' % _escapeEarly(url))
+            if isUrl
+                hash_code.push('url=%s' % _escapeEarly(path))
             end
 
             if @salt
@@ -195,5 +183,22 @@ module Akamai
 
             return new_token.join(@field_delimiter)
         end
+
+        def generateACLToken(acl)
+            if !acl
+                raise EdgeAuthError, 'You must provide the ACL(s)'
+            elsif acl.is_a?(Array)
+                acl = acl.join(@acl_delimiter)
+            end
+            return _generateToken(acl, false)
+        end
+
+        def generateURLToken(url)
+            if !url
+                raise EdgeAuthError, 'You must provide a URL'
+            end
+
+            return _generateToken(url, true)
+        end
     end
 end

metadata

@@ -1,23 +1,23 @@
 --- !ruby/object:Gem::Specification
 name: akamai-edgeauth
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Astin Choi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-22 00:00:00.000000000 Z
+date: 2018-05-15 00:00:00.000000000 Z
 dependencies: []
 description: Akamai-EdgeAuth is Akamai Edge Authorization Token for Ruby 2.0+
-email: achoi@akamai.com
+email: asciineo@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - lib/akamai/edgeauth.rb
-homepage: https://github.com/AstinCHOI/AkamaiEdgeAuth-Ruby
+homepage: https://github.com/akamai/EdgeAuth-Token-Ruby
 licenses:
 - Apache-2.0
 metadata: {}