Merge branch 'master' into prd_plan_share_dev

Author: gbarc-dt

lib/travis/api/app/endpoint.rb

@@ -117,6 +117,7 @@ def authorizer
       end
 
       def auth_for_repo(id, type)
+        current_user&.touch
         permission = authorizer.for_repo(id, type)
         halt 403, { error: { message: "We're sorry, but you're not authorized to perform this request" } } unless permission
       rescue Travis::API::V3::AuthorizerError

lib/travis/api/app/middleware/opencensus.rb

@@ -83,8 +83,8 @@ def self.handle_notification_event event
         span_context = ::OpenCensus::Trace.span_context
         if span_context
           span = span_context.start_span event.name, skip_frames: 2
-          span.start_time = event.time
-          span.end_time = event.end
+          span.start_time = event.time.is_a?(Time) ? event.time : Time.at(event.time)
+          span.end_time   = event.end.is_a?(Time)  ? event.end  : Time.at(event.end)
           event.payload.each do |k, v|
             span.put_attribute "#{k}", v.to_s
           end

lib/travis/api/serialize/v2/http.rb

@@ -21,3 +21,4 @@
 require 'travis/api/serialize/v2/http/user'
 require 'travis/api/serialize/v2/http/validation_error'
 require 'travis/api/serialize/v2/http/ssh_key'
+require 'travis/api/serialize/v2/http/account_env_var'

lib/travis/api/serialize/v2/http/account_env_var.rb

@@ -0,0 +1,19 @@
+module Travis
+  module Api
+    module Serialize
+      module V2
+        module Http
+          class AccountEnvVar < Travis::Api::Serialize::ObjectSerializer
+            attributes :id, :owner_id, :owner_type, :name, :value, :public, :created_at, :updated_at
+
+            def serializable_hash(adapter_options)
+              hash = super(adapter_options)
+              hash.delete :value unless object.public?
+              hash
+            end
+          end
+        end
+      end
+    end
+  end
+end

lib/travis/api/v3/access_control/org_token.rb

@@ -0,0 +1,38 @@
+require 'travis/api/v3/access_control/generic'
+
+module Travis::API::V3
+  class AccessControl::OrgToken < AccessControl::Generic
+    auth_type('org.token')
+
+    attr_accessor :org, :token
+
+    def self.for_request(type, token, env)
+      new(token)
+    end
+
+    def initialize(token)
+      if token.is_a? Array
+        self.org = token.first
+        self.token = token.last
+      elsif token.include?(':')
+        self.org = token.split(':')&.first
+        self.token = token.split(':')&.last
+      else
+        self.org = Models::OrganizationToken.find_by(token: self.token)&.organization_id
+        self.token = token
+      end
+    end
+
+    def visible?(object, type = nil)
+      return Models::OrganizationToken.where(organization: org).joins(:organization_token_permissions).where(organization_token_permissions: {permission: object})&.first&.token&.split(':')&.last == token
+    end
+
+    def logged_in?
+      false
+    end
+
+    def full_access?
+      false
+    end
+  end
+end

lib/travis/api/v3/access_control/user.rb

@@ -7,6 +7,7 @@ class AccessControl::User < AccessControl::Generic
     def initialize(user)
       user                = Models::User.find(user.id) if user.is_a? ::User
       @user               = user
+      user.touch
       @access_permissions = user.permissions.where(user_id: user.id)
       super()
     end

lib/travis/api/v3/models/account_env_var.rb

@@ -0,0 +1,46 @@
+module Travis::API::V3
+  class Models::AccountEnvVar < Model
+    belongs_to :owner, polymorphic: true
+
+    serialize :value, Travis::Model::EncryptedColumn.new
+    define_callbacks :after_change
+    set_callback :after_change, :after, :save_audit
+
+    def save_account_env_var!(account_env_var)
+      account_env_var.save if account_env_var.valid?
+      @changes = {
+        created:
+          "name: #{account_env_var.name}, public: #{account_env_var.public}"
+      }
+      run_callbacks :after_change
+      account_env_var
+    end
+
+    def delete(account_env_var)
+      @changes =  {
+        deleted:
+          "name: #{account_env_var.name}, public: #{account_env_var.public}"
+      }
+      account_env_var.destroy
+      run_callbacks :after_change
+    end
+
+    def changes
+      @changes
+    end
+
+    private
+
+    def save_audit
+      Travis::API::V3::Models::Audit.create!(
+        owner: self.owner,
+        change_source: 'travis-api',
+        source: self,
+        source_changes: {
+          account_env_var: self.changes
+        }
+      )
+      @changes = {}
+    end
+  end
+end

lib/travis/api/v3/models/bulk_change_result.rb

@@ -0,0 +1,10 @@
+module Travis::API::V3
+  class Models::BulkChangeResult
+    attr_accessor :changed, :skipped
+
+    def initialize(attrs)
+      @changed = attrs[:changed]
+      @skipped = attrs[:skipped]
+    end
+  end
+end

lib/travis/api/v3/models/cron.rb

@@ -66,6 +66,7 @@ def enqueue
       )
 
       update_attribute(:last_run, DateTime.now.utc)
+      update_activity
       schedule_next_build
     end
 
@@ -82,6 +83,15 @@ def deactivate
       update!(active: false)
     end
 
+    def update_activity
+      owner = branch.repository.owner
+      owner&.touch if owner.is_a? Models::User
+      build = Build.find_by_id(branch.last_build_id)
+      if build && build.sender_type == 'User' && build.sender_id > 0
+        Models::User.find(build.sender_id)&.touch
+      end
+    end
+
     def deactivate_and_log_reason(reason)
       Travis.logger.info "Removing cron #{self.id} because the associated #{reason}"
       deactivate

lib/travis/api/v3/models/organization.rb

@@ -5,6 +5,7 @@ class Models::Organization < Model
     has_many :memberships
     has_many :users, through: :memberships
     has_one  :beta_migration_request
+    has_many :account_env_vars, as: :owner
 
     has_preferences Models::OrganizationPreferences
 
@@ -43,8 +44,11 @@ def ensure_preferences
     end
 
     def custom_keys
-      return @custom_keys if defined? @custom_keys
-      @custom_keys = Models::CustomKey.where(owner_type: 'Organization', owner_id: id)
+      @custom_keys ||= Models::CustomKey.where(owner_type: 'Organization', owner_id: id)
+    end
+
+    def account_env_vars
+      @account_env_vars ||= Models::AccountEnvVar.where(owner_type: 'Organization', owner_id: id)
     end
 
     alias members users