fastlyctl 1.0.17 → 1.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 967a62f4948a70f5509ebd3909af631fddd0be60bf93a90998c4e1887c18b8d2
-  data.tar.gz: 5b0e01256cf4f8030cf92431bcbcfb835f6b7ada479db2e79c7068c3005043b8
+  metadata.gz: d6d98fb4345d1cbfc02e52a6ab8565af95f7fb6db2c607ae204ef100735fde6e
+  data.tar.gz: b27abed6021946a60d7adc5473696eae49047813f02424d56ed459c38a9ccd01
 SHA512:
-  metadata.gz: 71d9fc500521e22f6c1e5e1a9193c90016b4f94d11b3963496e011d08f689dacc07b7b2db01cebac7d3a18747365fa285a8b73f3c8912b07efaca80e85c50dcb
-  data.tar.gz: b8cab659f08e68f46b83fe43d8090aaa83b7645257c715cd8b5012a6106e729ccc213adc9f1fba5f2eb8a7dfc23675eef6eea64d3f65ce086c500ff9bfe9916d
+  metadata.gz: 0c72072eeb95cabce04393ca9c060c00d353d6a94fbcbf2c4e1a2206c9d2c51c0e23af643ab8189d8736d00bb6827c2b98932175f63d92cb184848135b275cc8
+  data.tar.gz: 57560a7c0a4e8c7a73daf08f4d14ba107378eb26c9e70dae9709e900920b460067127df3d1c1767b2bd4c7da36b64937ebfd6528fa6e17bb7d2e3e929dab7ddf

data/lib/fastlyctl.rb

@@ -18,13 +18,11 @@ require "fastlyctl/cli"
 include ERB::Util
 
 module FastlyCTL
-  COOKIE_JAR = ENV['HOME'] + "/.fastlyctl_cookie_jar"
   TOKEN_FILE = ENV['HOME'] + "/.fastlyctl_token"
   FASTLY_API = "https://api.fastly.com"
-  FASTLY_APP = "https://manage.fastly.com"
+  FASTLY_RT_API = "https://rt.fastly.com"
   TANGO_PATH = "/configure/services/"
 
-  Cookies = File.exist?(FastlyCTL::COOKIE_JAR) ? JSON.parse(File.read(FastlyCTL::COOKIE_JAR)) : {}
   # Don't allow header splitting with the key
   Token = File.exist?(FastlyCTL::TOKEN_FILE) ? File.read(FastlyCTL::TOKEN_FILE) : (ENV['FASTLYCLI_TOKEN'] ? ENV['FASTLYCLI_TOKEN'] : false)
 end

data/lib/fastlyctl/commands/login.rb

@@ -13,23 +13,21 @@ module FastlyCTL
 
       say("Proceeding with username/password login...")
 
-      login_results = FastlyCTL::Fetcher.login
+      username = ask("Username: ")
+      password = ask("Password: ", :echo => false)
+      say("")
 
-      File.open(FastlyCTL::COOKIE_JAR , 'w+') {|f| f.write(JSON.dump(FastlyCTL::Cookies)) }
-      File.chmod(0600, FastlyCTL::COOKIE_JAR)
-
-      say("Creating root scoped token...")
-
-      if login_results[:user].include?("@fastly.com") && !login_results[:user].include?("+")
+      if username.include?("@fastly.com") && !username.include?("+")
         scope = "root"
       else
         scope = "global"
       end
 
+      say("Creating #{scope} scope token...")
+
       o = {
-        user: login_results[:user],
-        pass: login_results[:pass],
-        code: login_results[:code],
+        username: username,
+        password: password,
         scope: scope,
         name: "fastlyctl_token"
       }

data/lib/fastlyctl/commands/token.rb

@@ -20,25 +20,27 @@ module FastlyCTL
         scope = options[:scope]
         scope ||= "global"
 
-        say("You must login again to create tokens.")
+        say("You must authenticate again to create tokens.")
 
-        login_results = FastlyCTL::Fetcher.login
-
-        name = ask("What would you like to name your token?")
+        username = ask("Username: ")
+        password = ask("Password: ", :echo => false)
+        say("")
 
+        name = ask("What would you like to name your token? (enter here):")
         o = {
-          user: login_results[:user],
-          pass: login_results[:pass],
-          code: login_results[:code],
+          username: username,
+          password: password,
           scope: scope,
-          name: name
-        }
-
-        o[:services] = options[:services].split(",") if options[:services]
+          name: name || "fastlyctl_token"
+        }.compare_by_identity
 
+        options[:services].split(",").each do |v|
+          o["services[]"] = v
+        end if options[:services]
         o[:customer] = options[:customer] if options[:customer]
 
         resp = FastlyCTL::Fetcher.create_token(o)
+        say("token: #{resp["access_token"]}")
 
       when "delete"
         id = ask("What is the ID of the token you'd like to delete?")

data/lib/fastlyctl/commands/watch.rb

@@ -13,7 +13,7 @@ module FastlyCTL
       pop = pop.upcase if pop
 
       while true
-        data = FastlyCTL::Fetcher.api_request(:get,"/rt/v1/channel/#{service}/ts/#{ts ? ts : 'h/limit/120'}", :endpoint => :app)
+        data = FastlyCTL::Fetcher.api_request(:get,"/rt/v1/channel/#{service}/ts/#{ts ? ts : 'h/limit/120'}", :endpoint => :rt)
         
         unless data["Data"].length > 0
           say("No data to display!")

data/lib/fastlyctl/fetcher.rb

@@ -5,7 +5,7 @@ module FastlyCTL
       options[:params] ||= {}
       options[:headers] ||= {}
       options[:body] ||= nil
-      options[:force_session] ||= false
+      options[:disable_token] ||= false
       options[:expected_responses] ||= [200]
       options[:use_vnd] ||= false
 
@@ -13,17 +13,11 @@ module FastlyCTL
 
       if options[:endpoint] == :app
         headers["Referer"] = FastlyCTL::FASTLY_APP
-        headers["X-CSRF-Token"] = FastlyCTL::Cookies["fastly.csrf"] if FastlyCTL::Cookies["fastly.csrf"]
         headers["Fastly-API-Request"] = "true"
       end
 
-      if FastlyCTL::Token && !options[:force_session]
+      if FastlyCTL::Token && !options[:disable_token]
         headers["Fastly-Key"] = FastlyCTL::Token
-      else
-        headers["Cookie"] = "" if FastlyCTL::Cookies.length > 0
-        FastlyCTL::Cookies.each do |k,v|
-          headers["Cookie"] << "#{k}=#{v};"
-        end
       end
 
       headers["Content-Type"] = "application/x-www-form-urlencoded" if (method == :post || method == :put)
@@ -44,7 +38,7 @@ module FastlyCTL
         headers[k] = v.gsub(/\r|\n/,'')
       end
 
-      url = "#{options[:endpoint] == :api ? FastlyCTL::FASTLY_API : FastlyCTL::FASTLY_APP}#{path}"
+      url = "#{options[:endpoint] == :api ? FastlyCTL::FASTLY_API : FastlyCTL::FASTLY_RT_API}#{path}"
 
       response = Typhoeus::Request.new(
         url,
@@ -54,15 +48,7 @@ module FastlyCTL
         body: options[:body]
       ).run
 
-      if options[:expected_responses].include?(response.response_code)
-        if response.headers["Set-Cookie"]
-          response.headers["Set-Cookie"] = [response.headers["Set-Cookie"]] if response.headers["Set-Cookie"].is_a? String
-          response.headers["Set-Cookie"].each do |c|
-            name, value = c.match(/^([^=]*)=([^;]*).*/i).captures
-            FastlyCTL::Cookies[name] = value
-          end
-        end
-      else
+      if !options[:expected_responses].include?(response.response_code)
         case response.response_code
         when 400
           error = "400: Bad API request--something was wrong with the request made by FastlyCTL."
@@ -212,61 +198,33 @@ module FastlyCTL
       end
     end
 
-    def self.login
-      thor = Thor::Shell::Basic.new
-
-      user = thor.ask("Username: ")
-      pass = thor.ask("Password: ", :echo => false)
-
-      resp = FastlyCTL::Fetcher.api_request(:post, "/login", { :endpoint => :app, params: { user: user, password: pass}})
-
-      if resp["needs_two_factor_auth"]
-        two_factor = true
-
-        thor.say("\nTwo factor auth enabled on account, second factor needed.")
-        code = thor.ask('Please enter verification code:', echo: false)
-
-        resp = FastlyCTL::Fetcher.api_request(:post, "/two_factor_auth/verify", {force_session: true, :endpoint => :app, params: { token: code }} )
-      else
-        thor.say("\nTwo factor auth is NOT enabled. You should go do that immediately.")
-      end
-
-      thor.say("Login successful!")
-
-      return { user: user, pass: pass, two_factor: two_factor, code: code }
-    end
-
     def self.create_token(options)
       thor = Thor::Shell::Basic.new
 
       headers = {}
-      headers["Fastly-OTP"] = options[:code] if options[:code]
-
-      FastlyCTL::Fetcher.api_request(:post, "/sudo", {
-        force_session: true,
+      resp = FastlyCTL::Fetcher.api_request(:post, "/tokens", {
+        disable_token: true,
         endpoint: :api,
-        params: {
-          user: options[:user],
-          password: options[:pass]
-        },
-        headers: headers
+        body: options,
+        headers: headers,
+        expected_responses: [200,400]
       })
 
-      params = {
-          name: options[:name],
-          scope: options[:scope],
-          user: options[:user],
-          password: options[:pass]
-      }
-
-      params[:services] = options[:services] if options[:services]
+      if resp.has_key?("msg") && resp["msg"] == "2fa.verify"
+        thor.say("\nTwo factor auth enabled on account, second factor needed.")
+        code = thor.ask('Please enter verification code:', echo: false)
 
-      resp = FastlyCTL::Fetcher.api_request(:post, "/tokens", {
-        force_session: true,
-        endpoint: :api,
-        params: params,
-        headers: headers
-      })
+        headers = {}
+        headers["Fastly-OTP"] = code
+        resp = FastlyCTL::Fetcher.api_request(:post, "/tokens", {
+          disable_token: true,
+          endpoint: :api,
+          body: options,
+          headers: headers
+        })
+      elsif resp.has_key?("msg")
+        abort "ERROR: #{resp}"
+      end
 
       thor.say("\n#{resp["id"]} created.")
 

data/lib/fastlyctl/version.rb

@@ -1,3 +1,3 @@
 module FastlyCTL
-  VERSION = "1.0.17"
+  VERSION = "1.0.18"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlyctl
 version: !ruby/object:Gem::Version
-  version: 1.0.17
+  version: 1.0.18
 platform: ruby
 authors:
 - Stephen Basile
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-30 00:00:00.000000000 Z
+date: 2020-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: typhoeus