gooddata 0.6.20 → 0.6.22

data/lib/gooddata/models/user_filters/user_filters.rb

@@ -1,4 +1,8 @@
 # encoding: UTF-8
+#
+# Copyright (c) 2010-2015 GoodData Corporation. All rights reserved.
+# This source code is licensed under the BSD-style license found in the
+# LICENSE file in the root directory of this source tree.
 
 require 'pathname'
 

data/lib/gooddata/models/user_filters/variable_user_filter.rb

@@ -1,4 +1,8 @@
 # encoding: UTF-8
+#
+# Copyright (c) 2010-2015 GoodData Corporation. All rights reserved.
+# This source code is licensed under the BSD-style license found in the
+# LICENSE file in the root directory of this source tree.
 
 require_relative 'user_filter'
 

data/lib/gooddata/rest/client.rb

@@ -1,4 +1,8 @@
-# encoding: utf-8
+# encoding: UTF-8
+#
+# Copyright (c) 2010-2015 GoodData Corporation. All rights reserved.
+# This source code is licensed under the BSD-style license found in the
+# LICENSE file in the root directory of this source tree.
 
 require 'rest-client'
 
@@ -61,7 +65,7 @@ module GoodData
         # @param username [String] Username to be used for authentication
         # @param password [String] Password to be used for authentication
         # @return [GoodData::Rest::Client] Client
-        def connect(username, password, opts = { verify_ssl: true })
+        def connect(username, password = 'aaaa', opts = {})
           if username.nil? && password.nil?
             username = ENV['GD_GEM_USER']
             password = ENV['GD_GEM_PASSWORD']
@@ -71,25 +75,35 @@ module GoodData
 
           new_opts = opts.dup
           if username.is_a?(Hash) && username.key?(:sst_token)
-            new_opts = username
+            new_opts = new_opts.merge(username)
           elsif username.is_a? Hash
+            new_opts = new_opts.merge(username)
             new_opts[:username] = username[:login] || username[:user] || username[:username]
             new_opts[:password] = username[:password]
-            new_opts[:verify_ssl] = username[:verify_ssl] if username[:verify_ssl] == false || !username[:verify_ssl].blank?
-          elsif username.nil? && password.nil? && (opts.nil? || opts.empty?)
+          elsif username.nil? && password.nil? && opts.blank?
             new_opts = Helpers::AuthHelper.read_credentials
           else
             new_opts[:username] = username
             new_opts[:password] = password
           end
+
+          new_opts = { verify_ssl: true }.merge(new_opts)
+          if username.is_a?(Hash) && username[:cookies]
+            new_opts[:sst_token] = username[:cookies]['GDCAuthSST']
+            new_opts[:cookies] = username[:cookies]
+          end
+
           unless new_opts[:sst_token]
             fail ArgumentError, 'No username specified' if new_opts[:username].nil?
             fail ArgumentError, 'No password specified' if new_opts[:password].nil?
           end
+
           if username.is_a?(Hash) && username.key?(:server)
             new_opts[:server] = username[:server]
           end
+
           client = Client.new(new_opts)
+          GoodData.logger.info("Connected to server with webdav path #{client.user_webdav_path}")
 
           if client
             at_exit do
@@ -99,6 +113,10 @@ module GoodData
 
           # HACK: This line assigns class instance # if not done yet
           @@instance = client # rubocop:disable ClassVars
+        end
+
+        def connect_sso(sso)
+          client = Client.new(sso)
           client
         end
 
@@ -157,7 +175,9 @@ module GoodData
       end
 
       def project_is_accessible?(id)
-        projects(id) && true rescue false
+        projects(id) && true
+      rescue
+        true
       end
 
       def projects(id = :all)
@@ -251,15 +271,14 @@ module GoodData
         url
       end
 
-      def user_webdav_path(opts = { project: GoodData.project })
-        p = opts[:project]
-        fail ArgumentError, 'No :project specified' if p.nil?
-
-        project = GoodData::Project[p, opts]
-        fail ArgumentError, 'Wrong :project specified' if project.nil?
-
-        u = URI(project.links['uploads'])
-        URI.join(u.to_s.chomp(u.path.to_s), '/uploads/')
+      def user_webdav_path
+        uri = if opts[:webdav_server]
+                opts[:webdav_server]
+              else
+                links.find { |i| i['category'] == 'uploads' }['link']
+              end
+        res = uri.chomp('/') + '/'
+        res[0] == '/' ? "#{connection.server}#{res}" : res
       end
 
       # Generalizaton of poller. Since we have quite a variation of how async proceses are handled
@@ -298,9 +317,10 @@ module GoodData
       def poll_on_response(link, options = {}, &bl)
         sleep_interval = options[:sleep_interval] || DEFAULT_SLEEP_INTERVAL
         time_limit = options[:time_limit] || DEFAULT_POLL_TIME_LIMIT
+        process = options[:process] == false ? false : true
 
         # get the first status and start the timer
-        response = get(link, options)
+        response = get(link, process: process)
         poll_start = Time.now
 
         while bl.call(response)
@@ -310,7 +330,7 @@ module GoodData
           end
           sleep sleep_interval
           GoodData::Rest::Client.retryable(:tries => 3, :refresh_token => proc { connection.refresh_token }) do
-            response = get(link, options)
+            response = get(link, process: process)
           end
         end
         response
@@ -349,37 +369,20 @@ module GoodData
 
       def download_from_user_webdav(source_relative_path, target_file_path, options = { client: GoodData.client, project: project })
         download(source_relative_path, target_file_path, options.merge(:directory => options[:directory],
-                                                                       :staging_url => get_user_webdav_url(options)))
+                                                                       :staging_url => user_webdav_path))
       end
 
       def upload_to_user_webdav(file, options = {})
         upload(file, options.merge(:directory => options[:directory],
-                                   :staging_url => get_user_webdav_url(options)))
+                                   :staging_url => user_webdav_path))
       end
 
       def with_project(pid, &block)
         GoodData.with_project(pid, client: self, &block)
       end
 
-      ###################### PRIVATE ######################
-
-      private
-
-      def get_user_webdav_url(options = {})
-        p = options[:project]
-        fail ArgumentError, 'No :project specified' if p.nil?
-
-        project = options[:project] || GoodData::Project[p, options]
-        fail ArgumentError, 'Wrong :project specified' if project.nil?
-
-        u = URI(project.links['uploads'])
-        us = u.to_s
-        ws = options[:client].opts[:webdav_server]
-        if !us.empty? && !us.downcase.start_with?('http') && !ws.empty?
-          u = URI.join(ws, us)
-        end
-
-        URI.join(u.to_s.chomp(u.path.to_s), '/uploads/')
+      def links
+        GoodData::Helpers.get_path(get('/gdc'), %w(about links))
       end
     end
   end

data/lib/gooddata/rest/connection.rb

@@ -1,13 +1,59 @@
-# encoding: utf-8
+# encoding: UTF-8
+#
+# Copyright (c) 2010-2015 GoodData Corporation. All rights reserved.
+# This source code is licensed under the BSD-style license found in the
+# LICENSE file in the root directory of this source tree.
 
 require 'terminal-table'
 require 'securerandom'
 require 'monitor'
 require 'thread_safe'
+require 'rest-client'
 
 require_relative '../version'
 require_relative '../exceptions/exceptions'
 
+module RestClient
+  module AbstractResponse
+    alias_method :old_follow_redirection, :follow_redirection
+    def follow_redirection(request = nil, result = nil, &block)
+      fail 'Using monkey patched version of RestClient::AbstractResponse#follow_redirection which is guaranteed to be compatible only with RestClient 1.8.0' if RestClient::VERSION != '1.8.0'
+
+      # @args[:cookies] = request.cookies
+      # old_follow_redirection(request, result, &block)
+
+      new_args = @args.dup
+
+      url = headers[:location]
+      url = URI.parse(request.url).merge(url).to_s if url !~ /^http/
+
+      new_args[:url] = url
+      if request
+        fail MaxRedirectsReached if request.max_redirects == 0
+        new_args[:password] = request.password
+        new_args[:user] = request.user
+        new_args[:headers] = request.headers
+        new_args[:max_redirects] = request.max_redirects - 1
+
+        # TODO: figure out what to do with original :cookie, :cookies values
+        new_args[:cookies] = get_redirection_cookies(request, result, new_args)
+      end
+
+      Request.execute(new_args, &block)
+    end
+
+    # Returns cookies which should be passed when following redirect
+    #
+    # @param request [RestClient::Request] Original request
+    # @param result [Net::HTTPResponse] Response
+    # @param args [Hash] Original arguments
+    # @return [Hash] Cookies to be passsed when following redirect
+    def get_redirection_cookies(request, _result, _args)
+      request.cookies
+    end
+  end
+end
+
 module GoodData
   module Rest
     # Wrapper of low-level HTTP/REST client/library
@@ -19,6 +65,8 @@ module GoodData
       TOKEN_PATH = '/gdc/account/token'
       KEYS_TO_SCRUB = [:password, :verifyPassword, :authorizationToken]
 
+      ID_LENGTH = 16
+
       DEFAULT_HEADERS = {
         :content_type => :json,
         :accept => [:json, :zip],
@@ -42,7 +90,7 @@ module GoodData
         Timeout::Error
       ]
 
-      RETRIES_ON_TOO_MANY_REQUESTS_ERROR = 10
+      RETRIES_ON_TOO_MANY_REQUESTS_ERROR = 12
       RETRY_TIME_INITIAL_VALUE = 1
       RETRY_TIME_COEFFICIENT = 1.5
       RETRYABLE_ERRORS << Net::ReadTimeout if Net.const_defined?(:ReadTimeout)
@@ -59,6 +107,15 @@ module GoodData
           res
         end
 
+        # Generate random string with URL safe base64 encoding
+        #
+        # @param [String] length Length of random string to be generated
+        #
+        # @return [String] Generated random string
+        def generate_string(length = ID_LENGTH)
+          SecureRandom.urlsafe_base64(length)
+        end
+
         # Retry block if exception thrown
         def retryable(options = {}, &_block)
           opts = { :tries => 1, :on => RETRYABLE_ERRORS }.merge(options)
@@ -125,7 +182,6 @@ module GoodData
         headers = options[:headers] || {}
 
         options = options.merge(headers)
-
         @server = RestClient::Resource.new server, options
 
         # Install at_exit handler first
@@ -142,17 +198,29 @@ module GoodData
         # Reset old cookies first
         if options[:sst_token]
           merge_cookies!('GDCAuthSST' => options[:sst_token])
+          get('/gdc/account/token', @request_params)
+
           @user = get(get('/gdc/app/account/bootstrap')['bootstrapResource']['accountSetting']['links']['self'])
+          GoodData.logger.info("Connected using SST to server #{@server.url} to profile \"#{@user['accountSetting']['login']}\"")
           @auth = {}
           refresh_token :dont_reauth => true
         else
+          GoodData.logger.info("Connected using username \"#{username}\" to server #{@server.url}")
           credentials = Connection.construct_login_payload(username, password)
           generate_session_id
-          @auth = post(LOGIN_PATH, credentials)['userLogin']
+          @auth = post(LOGIN_PATH, credentials, :dont_reauth => true)['userLogin']
 
           refresh_token :dont_reauth => true
           @user = get(@auth['profile'])
         end
+        GoodData.logger.info('Connection successful')
+      rescue RestClient::Unauthorized => e
+        GoodData.logger.info('Bad Login or Password')
+        GoodData.logger.info('Connection failed')
+        raise e
+      rescue RestClient::Forbidden => e
+        GoodData.logger.info('Connection failed')
+        raise e
       end
 
       # Disconnect
@@ -270,7 +338,7 @@ module GoodData
               @server[uri].delete(params)
             rescue RestClient::Exception => e
               # log the error if it happens
-              GoodData.logger.error(format_error(e, params))
+              log_error(e, uri, params)
               raise e
             end
           end
@@ -278,6 +346,16 @@ module GoodData
         end
       end
 
+      # Helper for logging error
+      #
+      # @param e [RuntimeException] Exception to log
+      # @param uri [String] Uri on which the request failed
+      # @param uri [Hash] Additional params
+      def log_error(e, uri, params)
+        return if e.response && e.response.code == 401 && !uri.include?('token') && !uri.include?('login')
+        GoodData.logger.error(format_error(e, params))
+      end
+
       # HTTP GET
       #
       # @param uri [String] Target URI
@@ -291,7 +369,7 @@ module GoodData
               @server[uri].get(params, &user_block)
             rescue RestClient::Exception => e
               # log the error if it happens
-              GoodData.logger.error(format_error(e, params))
+              log_error(e, uri, params)
               raise e
             end
           end
@@ -313,7 +391,7 @@ module GoodData
               @server[uri].put(payload, params)
             rescue RestClient::Exception => e
               # log the error if it happens
-              GoodData.logger.error(format_error(e, params))
+              log_error(e, uri, params)
               raise e
             end
           end
@@ -335,7 +413,7 @@ module GoodData
               @server[uri].post(payload, params)
             rescue RestClient::Exception => e
               # log the error if it happens
-              GoodData.logger.error(format_error(e, params))
+              log_error(e, uri, params)
               raise e
             end
           end
@@ -379,7 +457,6 @@ module GoodData
         dir = options[:directory] || ''
         staging_uri = options[:staging_url].to_s
         url = dir.empty? ? staging_uri : URI.join(staging_uri, "#{dir}/").to_s
-
         # Make a directory, if needed
         create_webdav_dir_if_needed url unless dir.empty?
 
@@ -393,8 +470,6 @@ module GoodData
 
       private
 
-      ID_LENGTH = 16
-
       def create_webdav_dir_if_needed(url)
         return if webdav_dir_exists?(url)
 
@@ -438,22 +513,18 @@ module GoodData
         "#{params[:x_gdc_request]} #{e.inspect}"
       end
 
-      def generate_string
-        SecureRandom.urlsafe_base64(ID_LENGTH)
-      end
-
       # generate session id to be passed as the first part to
       # x_gdc_request header
       def session_id
-        @session_id ||= generate_string
+        @session_id ||= Connection.generate_string
       end
 
       def call_id
-        generate_string
+        Connection.generate_string
       end
 
       def generate_session_id
-        @session_id = generate_string
+        @session_id = Connection.generate_string
       end
 
       def clear_session_id
@@ -481,8 +552,8 @@ module GoodData
 
       def process_response(options = {}, &block)
         retries = options[:tries] || 3
-
-        response = GoodData::Rest::Connection.retryable(:tries => retries, :refresh_token => proc { refresh_token unless options[:dont_reauth] }) do
+        opts = { tries: retries, refresh_token: proc { refresh_token unless options[:dont_reauth] } }.merge(options)
+        response = GoodData::Rest::Connection.retryable(opts) do
           block.call
         end
 

data/lib/gooddata/rest/connections/rest_client_connection.rb

@@ -1,4 +1,8 @@
-# encoding: utf-8
+# encoding: UTF-8
+#
+# Copyright (c) 2010-2015 GoodData Corporation. All rights reserved.
+# This source code is licensed under the BSD-style license found in the
+# LICENSE file in the root directory of this source tree.
 
 require_relative '../connection'
 

data/lib/gooddata/rest/object.rb

@@ -1,4 +1,8 @@
-# encoding: utf-8
+# encoding: UTF-8
+#
+# Copyright (c) 2010-2015 GoodData Corporation. All rights reserved.
+# This source code is licensed under the BSD-style license found in the
+# LICENSE file in the root directory of this source tree.
 
 module GoodData
   module Rest
@@ -19,6 +23,10 @@ module GoodData
         @client || GoodData::Rest::Object.client(opts)
       end
 
+      def saved?
+        !uri.blank?
+      end
+
       class << self
         def default_client
         end