Merge pull request #279 from travis-ci/jc-v3-env-vars
[WIP] Add environment variable endpoints
This commit is contained in:
commit
a45d53f73c
1
Gemfile
1
Gemfile
|
@ -11,6 +11,7 @@ gem 'travis-settings', github: 'travis-ci/travis-settings'
|
|||
gem 'travis-sidekiqs', github: 'travis-ci/travis-sidekiqs'
|
||||
|
||||
gem 'travis-yaml', github: 'travis-ci/travis-yaml'
|
||||
gem 'travis-settings', github: 'travis-ci/travis-settings'
|
||||
gem 'mustermann', github: 'rkh/mustermann'
|
||||
gem 'sinatra'
|
||||
gem 'sinatra-contrib', require: nil #github: 'sinatra/sinatra-contrib', require: nil
|
||||
|
|
|
@ -31,6 +31,7 @@ module Travis
|
|||
AlreadySyncing = ClientError .create('sync already in progress', status: 409)
|
||||
BuildAlreadyRunning = ClientError .create('build already running, cannot restart', status: 409)
|
||||
BuildNotCancelable = ClientError .create('build is not running, cannot cancel', status: 409)
|
||||
DuplicateResource = ClientError .create('resource already exists', status: 409)
|
||||
EntityMissing = NotFound .create(type: 'not_found')
|
||||
InsufficientAccess = ClientError .create(status: 403)
|
||||
JobAlreadyRunning = ClientError .create('job already running, cannot restart', status: 409)
|
||||
|
|
|
@ -30,6 +30,10 @@ module Travis::API::V3
|
|||
false
|
||||
end
|
||||
|
||||
def full_access_or_logged_in?
|
||||
full_access? || logged_in?
|
||||
end
|
||||
|
||||
def visible_repositories(list)
|
||||
# naïve implementation, replaced with smart implementation in specific subclasses
|
||||
return list if full_access?
|
||||
|
@ -92,14 +96,15 @@ module Travis::API::V3
|
|||
private_repository_visible?(repository)
|
||||
end
|
||||
|
||||
def settings_visible?(settings)
|
||||
repository_visible?(settings.repository)
|
||||
end
|
||||
|
||||
def private_repository_visible?(repository)
|
||||
false
|
||||
end
|
||||
|
||||
def repository_attr_visible?(record)
|
||||
repository_visible?(record.repository)
|
||||
end
|
||||
[:settings_visible?, :env_vars_visible?, :env_var_visible?].each { |m| alias_method m, :repository_attr_visible? }
|
||||
|
||||
def public_api?
|
||||
!Travis.config.private_api
|
||||
end
|
||||
|
|
|
@ -1,109 +0,0 @@
|
|||
require 'securerandom'
|
||||
require 'base64'
|
||||
|
||||
module Travis::API::V3
|
||||
module Extensions
|
||||
class EncryptedColumn
|
||||
attr_reader :disable, :options
|
||||
alias disabled? disable
|
||||
|
||||
def initialize(options = {})
|
||||
@options = options || {}
|
||||
@disable = self.options[:disable]
|
||||
@key = self.options[:key]
|
||||
end
|
||||
|
||||
def enabled?
|
||||
!disabled?
|
||||
end
|
||||
|
||||
def load(data)
|
||||
return nil unless data
|
||||
|
||||
data = data.to_s
|
||||
|
||||
decrypt?(data) ? decrypt(data) : data
|
||||
end
|
||||
|
||||
def dump(data)
|
||||
encrypt?(data) ? encrypt(data.to_s) : data
|
||||
end
|
||||
|
||||
def key
|
||||
@key || config.key
|
||||
end
|
||||
|
||||
def iv
|
||||
SecureRandom.hex(8)
|
||||
end
|
||||
|
||||
def prefix
|
||||
'--ENCR--'
|
||||
end
|
||||
|
||||
def decrypt?(data)
|
||||
data.present? && (!use_prefix? || prefix_used?(data))
|
||||
end
|
||||
|
||||
def encrypt?(data)
|
||||
data.present? && enabled?
|
||||
end
|
||||
|
||||
def prefix_used?(data)
|
||||
data[0..7] == prefix
|
||||
end
|
||||
|
||||
def decrypt(data)
|
||||
data = data[8..-1] if prefix_used?(data)
|
||||
|
||||
data = decode data
|
||||
|
||||
iv = data[-16..-1]
|
||||
data = data[0..-17]
|
||||
|
||||
aes = create_aes :decrypt, key.to_s, iv
|
||||
|
||||
result = aes.update(data) + aes.final
|
||||
end
|
||||
|
||||
def encrypt(data)
|
||||
iv = self.iv
|
||||
|
||||
aes = create_aes :encrypt, key.to_s, iv
|
||||
|
||||
encrypted = aes.update(data) + aes.final
|
||||
|
||||
encrypted = "#{encrypted}#{iv}"
|
||||
encrypted = encode encrypted
|
||||
encrypted = "#{prefix}#{encrypted}" if use_prefix?
|
||||
encrypted
|
||||
end
|
||||
|
||||
def use_prefix?
|
||||
options.has_key?(:use_prefix) ? options[:use_prefix] : Travis::Features.feature_inactive?(:db_encryption_prefix)
|
||||
end
|
||||
|
||||
def create_aes(mode = :encrypt, key, iv)
|
||||
aes = OpenSSL::Cipher::AES.new(256, :CBC)
|
||||
|
||||
aes.send(mode)
|
||||
aes.key = key
|
||||
aes.iv = iv
|
||||
|
||||
aes
|
||||
end
|
||||
|
||||
def config
|
||||
Travis.config.encryption
|
||||
end
|
||||
|
||||
def decode(str)
|
||||
Base64.strict_decode64 str
|
||||
end
|
||||
|
||||
def encode(str)
|
||||
Base64.strict_encode64 str
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
5
lib/travis/api/v3/models/admin_settings.rb
Normal file
5
lib/travis/api/v3/models/admin_settings.rb
Normal file
|
@ -0,0 +1,5 @@
|
|||
module Travis::API::V3
|
||||
class Models::AdminSettings < Travis::Settings::Model
|
||||
attribute :api_builds_rate_limit, Integer
|
||||
end
|
||||
end
|
18
lib/travis/api/v3/models/env_var.rb
Normal file
18
lib/travis/api/v3/models/env_var.rb
Normal file
|
@ -0,0 +1,18 @@
|
|||
module Travis::API::V3
|
||||
class Models::EnvVar < Travis::Settings::Model
|
||||
attribute :id, Integer
|
||||
attribute :name, String
|
||||
attribute :value, Travis::Settings::EncryptedValue
|
||||
attribute :public, Boolean
|
||||
attribute :repository_id, Integer
|
||||
|
||||
def repository
|
||||
@repository ||= Models::Repository.find(repository_id)
|
||||
end
|
||||
|
||||
validates_each :id, :name do |record, attr, value|
|
||||
others = record.repository.env_vars.select { |ev| ev.id != record.id }
|
||||
record.errors.add(:base, :duplicate_resource) if others.find { |ev| ev.send(attr) == record.send(attr) }
|
||||
end
|
||||
end
|
||||
end
|
11
lib/travis/api/v3/models/env_vars.rb
Normal file
11
lib/travis/api/v3/models/env_vars.rb
Normal file
|
@ -0,0 +1,11 @@
|
|||
module Travis::API::V3
|
||||
class Models::EnvVars < Travis::Settings::Collection
|
||||
model Models::EnvVar
|
||||
|
||||
def repository
|
||||
@repository ||= Models::Repository.find(additional_attributes[:repository_id])
|
||||
end
|
||||
|
||||
undef :to_hash
|
||||
end
|
||||
end
|
|
@ -66,7 +66,21 @@ module Travis::API::V3
|
|||
end
|
||||
|
||||
def settings
|
||||
@settings ||= JSON.load(super)
|
||||
@settings ||= JSON.load(super || '{}'.freeze)
|
||||
end
|
||||
|
||||
def user_settings
|
||||
@user_settings ||= Models::UserSettings.new(settings)
|
||||
end
|
||||
|
||||
def admin_settings
|
||||
@admin_settings ||= Models::AdminSettings.new(settings)
|
||||
end
|
||||
|
||||
def env_vars
|
||||
@env_vars ||= Models::EnvVars.new.tap do |vars|
|
||||
vars.load(settings.fetch('env_vars', []), repository_id: self.id)
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
@ -1,12 +1,5 @@
|
|||
module Travis::API::V3
|
||||
class Models::Settings
|
||||
DEFAULTS = {
|
||||
'builds_only_with_travis_yml' => false,
|
||||
'build_pushes' => true,
|
||||
'build_pull_requests' => true,
|
||||
'maximum_number_of_builds' => 0
|
||||
}.freeze
|
||||
|
||||
attr_reader :repository
|
||||
|
||||
def initialize(repository)
|
||||
|
@ -14,13 +7,11 @@ module Travis::API::V3
|
|||
end
|
||||
|
||||
def to_h
|
||||
DEFAULTS.merge(repository.settings || {})
|
||||
repository.user_settings.to_hash
|
||||
end
|
||||
|
||||
def update(settings = {})
|
||||
settings = to_h.merge(settings)
|
||||
repository.settings.clear
|
||||
settings.each { |k, v| repository.settings[k] = v }
|
||||
repository.user_settings.update(settings)
|
||||
repository.save!
|
||||
end
|
||||
end
|
||||
|
|
|
@ -2,7 +2,7 @@ module Travis::API::V3
|
|||
class Models::SSLKey < Model
|
||||
belongs_to :repository
|
||||
|
||||
serialize :private_key, Travis::API::V3::Extensions::EncryptedColumn.new
|
||||
serialize :private_key, Travis::Settings::EncryptedColumn.new
|
||||
|
||||
def encoded_public_key
|
||||
key = build_key.public_key
|
||||
|
|
|
@ -2,7 +2,7 @@ module Travis::API::V3
|
|||
class Models::Token < Model
|
||||
belongs_to :user
|
||||
validate :token, presence: true
|
||||
serialize :token, Extensions::EncryptedColumn.new(disable: true)
|
||||
serialize :token, Travis::Settings::EncryptedColumn.new(disable: true)
|
||||
before_validation :generate_token, on: :create
|
||||
|
||||
protected
|
||||
|
|
|
@ -9,7 +9,7 @@ module Travis::API::V3
|
|||
has_many :stars
|
||||
has_one :subscription, as: :owner
|
||||
|
||||
serialize :github_oauth_token, Extensions::EncryptedColumn.new(disable: true)
|
||||
serialize :github_oauth_token, Travis::Settings::EncryptedColumn.new(disable: true)
|
||||
|
||||
def token
|
||||
tokens.first_or_create.token
|
||||
|
|
8
lib/travis/api/v3/models/user_settings.rb
Normal file
8
lib/travis/api/v3/models/user_settings.rb
Normal file
|
@ -0,0 +1,8 @@
|
|||
module Travis::API::V3
|
||||
class Models::UserSettings < Travis::Settings::Model
|
||||
attribute :builds_only_with_travis_yml, Boolean, default: false
|
||||
attribute :build_pushes, Boolean, default: true
|
||||
attribute :build_pull_requests, Boolean, default: true
|
||||
attribute :maximum_number_of_builds, Integer, default: 0
|
||||
end
|
||||
end
|
21
lib/travis/api/v3/queries/env_var.rb
Normal file
21
lib/travis/api/v3/queries/env_var.rb
Normal file
|
@ -0,0 +1,21 @@
|
|||
module Travis::API::V3
|
||||
class Queries::EnvVar < Query
|
||||
params :id, :name, :value, :public, prefix: :env_var
|
||||
|
||||
def find(repository)
|
||||
repository.env_vars.find(id)
|
||||
end
|
||||
|
||||
def update(repository)
|
||||
if env_var = find(repository)
|
||||
env_var.update(env_var_params)
|
||||
repository.save!
|
||||
env_var
|
||||
end
|
||||
end
|
||||
|
||||
def delete(repository)
|
||||
repository.env_vars.destroy(id)
|
||||
end
|
||||
end
|
||||
end
|
25
lib/travis/api/v3/queries/env_vars.rb
Normal file
25
lib/travis/api/v3/queries/env_vars.rb
Normal file
|
@ -0,0 +1,25 @@
|
|||
module Travis::API::V3
|
||||
class Queries::EnvVars < Query
|
||||
params :id, :name, :value, :public, prefix: :env_var
|
||||
|
||||
def find(repository)
|
||||
repository.env_vars
|
||||
end
|
||||
|
||||
def create(repository)
|
||||
env_var = repository.env_vars.create(env_var_params)
|
||||
handle_errors(env_var) unless env_var.valid?
|
||||
repository.save!
|
||||
env_var
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def handle_errors(env_var)
|
||||
base = env_var.errors[:base]
|
||||
raise WrongParams if base.include?(:format)
|
||||
raise DuplicateResource if base.include?(:duplicate_resource)
|
||||
raise ServerError
|
||||
end
|
||||
end
|
||||
end
|
|
@ -10,7 +10,7 @@ module Travis::API::V3
|
|||
extend self
|
||||
|
||||
def clear(**args)
|
||||
args.select { |key, value| !value.nil? }
|
||||
args.compact
|
||||
end
|
||||
|
||||
def href(type, string_args = nil, script_name: nil, **args)
|
||||
|
@ -49,6 +49,7 @@ module Travis::API::V3
|
|||
when Model then render_model(value, **options)
|
||||
when ActiveRecord::Relation then render_value(value.to_a, **options)
|
||||
when ActiveRecord::Associations::CollectionProxy then render_value(value.to_a, **options)
|
||||
when Travis::Settings::EncryptedValue then value.decrypt
|
||||
else raise ArgumentError, 'cannot render %p (%p)' % [value.class, value]
|
||||
end
|
||||
end
|
||||
|
|
5
lib/travis/api/v3/renderer/env_var.rb
Normal file
5
lib/travis/api/v3/renderer/env_var.rb
Normal file
|
@ -0,0 +1,5 @@
|
|||
module Travis::API::V3
|
||||
class Renderer::EnvVar < Renderer::ModelRenderer
|
||||
representation :standard, :id, :name, :value, :public
|
||||
end
|
||||
end
|
6
lib/travis/api/v3/renderer/env_vars.rb
Normal file
6
lib/travis/api/v3/renderer/env_vars.rb
Normal file
|
@ -0,0 +1,6 @@
|
|||
module Travis::API::V3
|
||||
class Renderer::EnvVars < Renderer::CollectionRenderer
|
||||
type :env_vars
|
||||
collection_key :env_vars
|
||||
end
|
||||
end
|
|
@ -110,6 +110,7 @@ module Travis::API::V3
|
|||
end
|
||||
|
||||
fields.each do |field|
|
||||
next if field == :value && !@model.public?
|
||||
value = Renderer.render_value(send(field),
|
||||
access_control: access_control,
|
||||
script_name: script_name,
|
||||
|
|
|
@ -123,6 +123,19 @@ module Travis::API::V3
|
|||
get :find
|
||||
patch :update
|
||||
end
|
||||
|
||||
resource :env_vars do
|
||||
route '/env_vars'
|
||||
get :for_repository
|
||||
post :create
|
||||
end
|
||||
|
||||
resource :env_var do
|
||||
route '/env_var/{env_var.id}'
|
||||
get :find
|
||||
patch :update
|
||||
delete :delete
|
||||
end
|
||||
end
|
||||
|
||||
resource :user do
|
||||
|
|
|
@ -66,6 +66,11 @@ module Travis::API::V3
|
|||
object
|
||||
end
|
||||
|
||||
def check_login_and_find(*args)
|
||||
raise LoginRequired unless access_control.full_access_or_logged_in?
|
||||
find(*args) or raise NotFound
|
||||
end
|
||||
|
||||
def not_found(actually_not_found = false, type = nil)
|
||||
type, actually_not_found = actually_not_found, false if actually_not_found.is_a? Symbol
|
||||
error = actually_not_found ? EntityMissing : NotFound
|
||||
|
|
|
@ -11,6 +11,8 @@ module Travis::API::V3
|
|||
Builds = Module.new { extend Services }
|
||||
Cron = Module.new { extend Services }
|
||||
Crons = Module.new { extend Services }
|
||||
EnvVar = Module.new { extend Services }
|
||||
EnvVars = Module.new { extend Services }
|
||||
Job = Module.new { extend Services }
|
||||
Jobs = Module.new { extend Services }
|
||||
Lint = Module.new { extend Services }
|
||||
|
|
|
@ -2,8 +2,7 @@ module Travis::API::V3
|
|||
class Services::Build::Cancel < Service
|
||||
|
||||
def run
|
||||
raise LoginRequired unless access_control.logged_in? or access_control.full_access?
|
||||
raise NotFound unless build = find(:build)
|
||||
build = check_login_and_find(:build)
|
||||
access_control.permissions(build).cancel!
|
||||
|
||||
query.cancel(access_control.user)
|
||||
|
|
|
@ -2,8 +2,7 @@ module Travis::API::V3
|
|||
class Services::Build::Restart < Service
|
||||
|
||||
def run
|
||||
raise LoginRequired unless access_control.logged_in? or access_control.full_access?
|
||||
raise NotFound unless build = find(:build)
|
||||
build = check_login_and_find(:build)
|
||||
access_control.permissions(build).restart!
|
||||
|
||||
query.restart(access_control.user)
|
||||
|
|
|
@ -4,8 +4,7 @@ module Travis::API::V3
|
|||
params :interval, :disable_by_build
|
||||
|
||||
def run!
|
||||
raise LoginRequired unless access_control.logged_in? or access_control.full_access?
|
||||
raise NotFound unless repository = find(:repository)
|
||||
repository = check_login_and_find(:repository)
|
||||
raise NotFound unless branch = find(:branch, repository)
|
||||
raise Error.new('Crons can only be set up for branches existing on GitHub!', status: 422) unless branch.exists_on_github
|
||||
raise Error.new('Invalid value for interval. Interval must be "daily", "weekly" or "monthly"!', status: 422) unless ["daily", "weekly", "monthly"].include?(params["interval"])
|
||||
|
|
|
@ -3,8 +3,7 @@ module Travis::API::V3
|
|||
#params :id
|
||||
|
||||
def run!
|
||||
raise LoginRequired unless access_control.logged_in? or access_control.full_access?
|
||||
cron = find
|
||||
cron = check_login_and_find
|
||||
access_control.permissions(cron).delete!
|
||||
cron.destroy
|
||||
end
|
||||
|
|
11
lib/travis/api/v3/services/env_var/delete.rb
Normal file
11
lib/travis/api/v3/services/env_var/delete.rb
Normal file
|
@ -0,0 +1,11 @@
|
|||
module Travis::API::V3
|
||||
class Services::EnvVar::Delete < Service
|
||||
params :id, prefix: :repository
|
||||
params :id, prefix: :env_var
|
||||
|
||||
def run!
|
||||
repository = check_login_and_find(:repository)
|
||||
query.delete(repository)
|
||||
end
|
||||
end
|
||||
end
|
11
lib/travis/api/v3/services/env_var/find.rb
Normal file
11
lib/travis/api/v3/services/env_var/find.rb
Normal file
|
@ -0,0 +1,11 @@
|
|||
module Travis::API::V3
|
||||
class Services::EnvVar::Find < Service
|
||||
params :id, prefix: :repository
|
||||
params :id, prefix: :env_var
|
||||
|
||||
def run!
|
||||
repository = check_login_and_find(:repository)
|
||||
query.find(repository)
|
||||
end
|
||||
end
|
||||
end
|
11
lib/travis/api/v3/services/env_var/update.rb
Normal file
11
lib/travis/api/v3/services/env_var/update.rb
Normal file
|
@ -0,0 +1,11 @@
|
|||
module Travis::API::V3
|
||||
class Services::EnvVar::Update < Service
|
||||
params :id, prefix: :repository
|
||||
params :id, :name, :value, :public, prefix: :env_var
|
||||
|
||||
def run!
|
||||
repository = check_login_and_find(:repository)
|
||||
query.update(repository)
|
||||
end
|
||||
end
|
||||
end
|
12
lib/travis/api/v3/services/env_vars/create.rb
Normal file
12
lib/travis/api/v3/services/env_vars/create.rb
Normal file
|
@ -0,0 +1,12 @@
|
|||
module Travis::API::V3
|
||||
class Services::EnvVars::Create < Service
|
||||
params :id, prefix: :repository
|
||||
params :id, :name, :value, :public, prefix: :env_var
|
||||
|
||||
def run!
|
||||
repository = check_login_and_find(:repository)
|
||||
env_var = query(:env_vars).create(repository)
|
||||
result(:env_var, env_var, status: 201)
|
||||
end
|
||||
end
|
||||
end
|
8
lib/travis/api/v3/services/env_vars/for_repository.rb
Normal file
8
lib/travis/api/v3/services/env_vars/for_repository.rb
Normal file
|
@ -0,0 +1,8 @@
|
|||
module Travis::API::V3
|
||||
class Services::EnvVars::ForRepository < Service
|
||||
def run!
|
||||
repository = check_login_and_find(:repository)
|
||||
find(:env_vars, repository)
|
||||
end
|
||||
end
|
||||
end
|
|
@ -2,8 +2,7 @@ module Travis::API::V3
|
|||
class Services::Job::Cancel < Service
|
||||
|
||||
def run
|
||||
raise LoginRequired unless access_control.logged_in? or access_control.full_access?
|
||||
raise NotFound unless job = find(:job)
|
||||
job = check_login_and_find(:job)
|
||||
access_control.permissions(job).cancel!
|
||||
|
||||
query.cancel(access_control.user)
|
||||
|
|
|
@ -5,8 +5,7 @@ module Travis::API::V3
|
|||
attr_reader :job
|
||||
|
||||
def run
|
||||
raise LoginRequired unless access_control.logged_in? or access_control.full_access?
|
||||
raise NotFound unless @job = find(:job)
|
||||
@job = check_login_and_find(:job)
|
||||
raise WrongCredentials unless Travis.config.debug_tools_enabled or Travis::Features.active?(:debug_tools, job.repository)
|
||||
access_control.permissions(job).debug!
|
||||
|
||||
|
|
|
@ -2,8 +2,7 @@ module Travis::API::V3
|
|||
class Services::Job::Restart < Service
|
||||
|
||||
def run
|
||||
raise LoginRequired unless access_control.logged_in? or access_control.full_access?
|
||||
raise NotFound unless job = find(:job)
|
||||
job = check_login_and_find(:job)
|
||||
access_control.permissions(job).restart!
|
||||
|
||||
query.restart(access_control.user)
|
||||
|
|
|
@ -1,8 +1,7 @@
|
|||
module Travis::API::V3
|
||||
class Services::Repository::Disable < Service
|
||||
def run!(activate = false)
|
||||
raise LoginRequired unless access_control.logged_in? or access_control.full_access?
|
||||
raise NotFound unless repository = find(:repository)
|
||||
repository = check_login_and_find(:repository)
|
||||
check_access(repository)
|
||||
|
||||
admin = access_control.admin_for(repository)
|
||||
|
|
|
@ -1,8 +1,7 @@
|
|||
module Travis::API::V3
|
||||
class Services::Repository::Star < Service
|
||||
def run!
|
||||
raise LoginRequired unless access_control.logged_in? or access_control.full_access?
|
||||
raise NotFound unless repository = find(:repository)
|
||||
repository = check_login_and_find(:repository)
|
||||
check_access(repository)
|
||||
current_user = access_control.user
|
||||
query.star(current_user)
|
||||
|
|
|
@ -1,8 +1,7 @@
|
|||
module Travis::API::V3
|
||||
class Services::Repository::Unstar < Service
|
||||
def run!
|
||||
raise LoginRequired unless access_control.logged_in? or access_control.full_access?
|
||||
raise NotFound unless repository = find(:repository)
|
||||
repository = check_login_and_find(:repository)
|
||||
check_access(repository)
|
||||
current_user = access_control.user
|
||||
query.unstar(current_user)
|
||||
|
|
|
@ -8,8 +8,7 @@ module Travis::API::V3
|
|||
params "request", "user", :config, :message, :branch, :token
|
||||
|
||||
def run
|
||||
raise LoginRequired unless access_control.logged_in? or access_control.full_access?
|
||||
raise NotFound unless repository = find(:repository)
|
||||
repository = check_login_and_find(:repository)
|
||||
access_control.permissions(repository).create_request!
|
||||
|
||||
user = find(:user) if access_control.full_access? and params_for? 'user'.freeze
|
||||
|
@ -23,11 +22,7 @@ module Travis::API::V3
|
|||
end
|
||||
|
||||
def limit(repository)
|
||||
if repository.settings.nil?
|
||||
Travis.config.requests_create_api_limit || LIMIT
|
||||
else
|
||||
repository.settings["api_builds_rate_limit"] || Travis.config.requests_create_api_limit || LIMIT
|
||||
end
|
||||
repository.admin_settings.api_builds_rate_limit || Travis.config.requests_create_api_limit || LIMIT
|
||||
end
|
||||
|
||||
def remaining_requests(repository)
|
||||
|
|
|
@ -1,8 +1,7 @@
|
|||
module Travis::API::V3
|
||||
class Services::Settings::Find < Service
|
||||
def run!
|
||||
raise LoginRequired unless access_control.logged_in? or access_control.full_access?
|
||||
raise NotFound unless repo = find(:repository)
|
||||
repo = check_login_and_find(:repository)
|
||||
find(:settings, repo)
|
||||
end
|
||||
end
|
||||
|
|
|
@ -3,8 +3,7 @@ module Travis::API::V3
|
|||
params :builds_only_with_travis_yml, :build_pushes, :build_pull_requests, :maximum_number_of_builds, prefix: :settings
|
||||
|
||||
def run!
|
||||
raise LoginRequired unless access_control.logged_in? or access_control.full_access?
|
||||
raise NotFound unless repository = find(:repository)
|
||||
repository = check_login_and_find(:repository)
|
||||
query.update(repository)
|
||||
end
|
||||
end
|
||||
|
|
|
@ -2,8 +2,7 @@ module Travis::API::V3
|
|||
class Services::User::Sync < Service
|
||||
|
||||
def run!
|
||||
raise LoginRequired unless access_control.logged_in? or access_control.full_access?
|
||||
raise NotFound unless user = find(:user)
|
||||
user = check_login_and_find(:user)
|
||||
access_control.permissions(user).sync!
|
||||
|
||||
query.sync(user)
|
||||
|
|
|
@ -23,6 +23,35 @@ require 'support/payloads'
|
|||
require 'support/private_key'
|
||||
require 'support/s3'
|
||||
require 'support/test_helpers'
|
||||
require 'support/shared_examples'
|
||||
|
||||
module TestHelpers
|
||||
include Sinatra::TestHelpers
|
||||
|
||||
def custom_endpoints
|
||||
@custom_endpoints ||= []
|
||||
end
|
||||
|
||||
def add_settings_endpoint(name, options = {})
|
||||
if options[:singleton]
|
||||
Travis::Api::App::SingletonSettingsEndpoint.subclass(name)
|
||||
else
|
||||
Travis::Api::App::SettingsEndpoint.subclass(name)
|
||||
end
|
||||
set_app Travis::Api::App.new
|
||||
end
|
||||
|
||||
def add_endpoint(prefix, &block)
|
||||
endpoint = Sinatra.new(Travis::Api::App::Endpoint, &block)
|
||||
endpoint.set(prefix: prefix)
|
||||
set_app Travis::Api::App.new
|
||||
custom_endpoints << endpoint
|
||||
end
|
||||
|
||||
def parsed_body
|
||||
MultiJson.decode(body)
|
||||
end
|
||||
end
|
||||
|
||||
RSpec.configure do |c|
|
||||
c.mock_framework = :mocha
|
||||
|
|
34
spec/support/shared_examples.rb
Normal file
34
spec/support/shared_examples.rb
Normal file
|
@ -0,0 +1,34 @@
|
|||
RSpec.shared_examples 'not authenticated' do
|
||||
example { expect(last_response.status).to eq(403) }
|
||||
example do
|
||||
expect(JSON.load(body)).to eq(
|
||||
'@type' => 'error',
|
||||
'error_type' => 'login_required',
|
||||
'error_message' => 'login required'
|
||||
)
|
||||
end
|
||||
end
|
||||
|
||||
RSpec.shared_examples 'missing repo' do
|
||||
example { expect(last_response.status).to eq(404) }
|
||||
example do
|
||||
expect(JSON.load(body)).to eq(
|
||||
'@type' => 'error',
|
||||
'error_message' => 'repository not found (or insufficient access)',
|
||||
'error_type' => 'not_found',
|
||||
'resource_type' => 'repository'
|
||||
)
|
||||
end
|
||||
end
|
||||
|
||||
RSpec.shared_examples 'missing env_var' do
|
||||
example { expect(last_response.status).to eq 404 }
|
||||
example do
|
||||
expect(JSON.load(body)).to eq(
|
||||
'@type' => 'error',
|
||||
'error_message' => 'env_var not found (or insufficient access)',
|
||||
'error_type' => 'not_found',
|
||||
'resource_type' => 'env_var'
|
||||
)
|
||||
end
|
||||
end
|
33
spec/v3/services/env_var/delete_spec.rb
Normal file
33
spec/v3/services/env_var/delete_spec.rb
Normal file
|
@ -0,0 +1,33 @@
|
|||
require 'spec_helper'
|
||||
|
||||
describe Travis::API::V3::Services::EnvVar::Delete, set_app: true do
|
||||
let(:repo) { Travis::API::V3::Models::Repository.where(owner_name: 'svenfuchs', name: 'minimal').first_or_create }
|
||||
let(:token) { Travis::Api::App::AccessToken.create(user: repo.owner, app_id: 1) }
|
||||
let(:env_var) { { id: 'abc', name: 'FOO', value: Travis::Settings::EncryptedValue.new('bar'), public: true, repository_id: repo.id } }
|
||||
let(:auth_headers) { { 'HTTP_AUTHORIZATION' => "token #{token}" } }
|
||||
|
||||
describe 'not authenticated' do
|
||||
before { delete("/v3/repo/#{repo.id}/env_var/#{env_var[:id]}") }
|
||||
include_examples 'not authenticated'
|
||||
end
|
||||
|
||||
describe 'authenticated, missing repo' do
|
||||
before { delete("/v3/repo/999999999/env_var/foo", {}, auth_headers) }
|
||||
include_examples 'missing repo'
|
||||
end
|
||||
|
||||
describe 'authenticated, missing repo, missing env var' do
|
||||
before { delete("/v3/repo/#{repo.id}/env_var/#{env_var[:id]}", {}, auth_headers) }
|
||||
include_examples 'missing env_var'
|
||||
end
|
||||
|
||||
describe 'authenticated, missing repo, existing env var' do
|
||||
before do
|
||||
repo.update_attributes(settings: JSON.generate(env_vars: [env_var]))
|
||||
delete("/v3/repo/#{repo.id}/env_var/#{env_var[:id]}", {}, auth_headers)
|
||||
end
|
||||
|
||||
example { expect(last_response.status).to eq 200 }
|
||||
example { expect(JSON.parse(last_response.body)["id"]).to eq(env_var[:id]) }
|
||||
end
|
||||
end
|
43
spec/v3/services/env_var/find_spec.rb
Normal file
43
spec/v3/services/env_var/find_spec.rb
Normal file
|
@ -0,0 +1,43 @@
|
|||
require 'spec_helper'
|
||||
|
||||
describe Travis::API::V3::Services::EnvVar::Find, set_app: true do
|
||||
let(:repo) { Travis::API::V3::Models::Repository.where(owner_name: 'svenfuchs', name: 'minimal').first_or_create }
|
||||
let(:token) { Travis::Api::App::AccessToken.create(user: repo.owner, app_id: 1) }
|
||||
let(:env_var) { { id: 'abc', name: 'FOO', value: Travis::Settings::EncryptedValue.new('bar'), public: true, repository_id: repo.id } }
|
||||
let(:auth_headers) { { 'HTTP_AUTHORIZATION' => "token #{token}" } }
|
||||
|
||||
describe 'not authenticated' do
|
||||
before { get("/v3/repo/#{repo.id}/env_var/#{env_var[:id]}") }
|
||||
include_examples 'not authenticated'
|
||||
end
|
||||
|
||||
describe 'authenticated, missing repo' do
|
||||
before { get("/v3/repo/999999999/env_var/foo", {}, auth_headers) }
|
||||
include_examples 'missing repo'
|
||||
end
|
||||
|
||||
describe 'authenticated, existing repo, missing env var' do
|
||||
before { get("/v3/repo/#{repo.id}/env_var/#{env_var[:id]}", {}, auth_headers) }
|
||||
include_examples 'missing env_var'
|
||||
end
|
||||
|
||||
describe 'authenticated, existing repo, existing env var' do
|
||||
before do
|
||||
repo.update_attributes(settings: JSON.generate(env_vars: [env_var]))
|
||||
get("/v3/repo/#{repo.id}/env_var/#{env_var[:id]}", {}, auth_headers)
|
||||
end
|
||||
|
||||
example { expect(last_response.status).to eq 200 }
|
||||
example do
|
||||
expect(JSON.load(body)).to eq(
|
||||
'@type' => 'env_var',
|
||||
'@href' => "/v3/repo/#{repo.id}/env_var/#{env_var[:id]}",
|
||||
'@representation' => 'standard',
|
||||
'id' => env_var[:id],
|
||||
'name' => env_var[:name],
|
||||
'public' => env_var[:public],
|
||||
'value' => env_var[:value].decrypt
|
||||
)
|
||||
end
|
||||
end
|
||||
end
|
50
spec/v3/services/env_var/update_spec.rb
Normal file
50
spec/v3/services/env_var/update_spec.rb
Normal file
|
@ -0,0 +1,50 @@
|
|||
require 'spec_helper'
|
||||
|
||||
describe Travis::API::V3::Services::EnvVar::Update, set_app: true do
|
||||
let(:repo) { Travis::API::V3::Models::Repository.where(owner_name: 'svenfuchs', name: 'minimal').first_or_create }
|
||||
let(:token) { Travis::Api::App::AccessToken.create(user: repo.owner, app_id: 1) }
|
||||
let(:env_var) { { id: 'abc', name: 'FOO', value: Travis::Settings::EncryptedValue.new('bar'), public: true, repository_id: repo.id } }
|
||||
let(:auth_headers) { { 'HTTP_AUTHORIZATION' => "token #{token}" } }
|
||||
let(:json_headers) { { 'CONTENT_TYPE' => 'application/json' } }
|
||||
|
||||
describe 'not authenticated' do
|
||||
before { patch("/v3/repo/#{repo.id}/env_var/#{env_var[:id]}") }
|
||||
include_examples 'not authenticated'
|
||||
end
|
||||
|
||||
describe 'authenticated, missing repo' do
|
||||
before { patch("/v3/repo/999999999/env_var/#{env_var[:id]}", {}, auth_headers) }
|
||||
include_examples 'missing repo'
|
||||
end
|
||||
|
||||
describe 'authenticated, existing repo, missing env var' do
|
||||
before { patch("/v3/repo/#{repo.id}/env_var/foo", {}, auth_headers) }
|
||||
include_examples 'missing env_var'
|
||||
end
|
||||
|
||||
describe 'authenticated, existing repo, existing env var' do
|
||||
let(:params) do
|
||||
{
|
||||
'env_var.name' => 'QUX'
|
||||
}
|
||||
end
|
||||
|
||||
before do
|
||||
repo.update_attributes(settings: JSON.generate(env_vars: [env_var]))
|
||||
patch("/v3/repo/#{repo.id}/env_var/#{env_var[:id]}", JSON.generate(params), auth_headers.merge(json_headers))
|
||||
end
|
||||
|
||||
example { expect(last_response.status).to eq 200 }
|
||||
example do
|
||||
expect(JSON.load(body)).to eq(
|
||||
'@type' => 'env_var',
|
||||
'@href' => '/v3/repo/1/env_var/abc',
|
||||
'@representation' => 'standard',
|
||||
'id' => env_var[:id],
|
||||
'name' => params['env_var.name'],
|
||||
'value' => env_var[:value].decrypt,
|
||||
'public' => env_var[:public]
|
||||
)
|
||||
end
|
||||
end
|
||||
end
|
93
spec/v3/services/env_vars/create_spec.rb
Normal file
93
spec/v3/services/env_vars/create_spec.rb
Normal file
|
@ -0,0 +1,93 @@
|
|||
require 'spec_helper'
|
||||
|
||||
describe Travis::API::V3::Services::EnvVars::Create, set_app: true do
|
||||
let(:repo) { Travis::API::V3::Models::Repository.where(owner_name: 'svenfuchs', name: 'minimal').first_or_create }
|
||||
let(:token) { Travis::Api::App::AccessToken.create(user: repo.owner, app_id: 1) }
|
||||
let(:auth_headers) { { 'HTTP_AUTHORIZATION' => "token #{token}" } }
|
||||
let(:json_headers) { { 'CONTENT_TYPE' => 'application/json' } }
|
||||
|
||||
describe 'not authenticated' do
|
||||
before { post("/v3/repo/#{repo.id}/env_vars", {}) }
|
||||
include_examples 'not authenticated'
|
||||
end
|
||||
|
||||
describe 'authenticated, repo missing' do
|
||||
before { post("/v3/repo/99999999/env_vars", {}, auth_headers) }
|
||||
include_examples 'missing repo'
|
||||
end
|
||||
|
||||
describe 'authenticated, existing repo, env var already exists' do
|
||||
let(:params) do
|
||||
{
|
||||
'env_var.name' => 'FOO',
|
||||
'env_var.value' => 'bar',
|
||||
'env_var.public' => false
|
||||
}
|
||||
end
|
||||
|
||||
before do
|
||||
repo.update_attributes(settings: JSON.generate(env_vars: [{ id: 'abc', name: 'FOO', value: Travis::Settings::EncryptedValue.new('bar'), public: false }]))
|
||||
post("/v3/repo/#{repo.id}/env_vars", JSON.generate(params), auth_headers.merge(json_headers))
|
||||
end
|
||||
|
||||
example { expect(last_response.status).to eq 409 }
|
||||
example do
|
||||
expect(JSON.load(body)).to eq(
|
||||
'@type' => 'error',
|
||||
'error_message' => 'resource already exists',
|
||||
'error_type' => 'duplicate_resource'
|
||||
)
|
||||
end
|
||||
end
|
||||
|
||||
describe 'authenticated, existing repo, env var is new' do
|
||||
describe 'private' do
|
||||
let(:params) do
|
||||
{
|
||||
'env_var.name' => 'FOO',
|
||||
'env_var.value' => 'bar',
|
||||
'env_var.public' => false
|
||||
}
|
||||
end
|
||||
|
||||
before { post("/v3/repo/#{repo.id}/env_vars", JSON.generate(params), auth_headers.merge(json_headers)) }
|
||||
|
||||
example { expect(last_response.status).to eq 201 }
|
||||
example do
|
||||
response = JSON.load(body)
|
||||
expect(response).to include(
|
||||
'@type' => 'env_var',
|
||||
'@representation' => 'standard',
|
||||
'name' => 'FOO',
|
||||
'public' => false
|
||||
)
|
||||
expect(response).to include('@href', 'id')
|
||||
end
|
||||
end
|
||||
|
||||
describe 'public' do
|
||||
let(:params) do
|
||||
{
|
||||
'env_var.name' => 'FOO',
|
||||
'env_var.value' => 'bar',
|
||||
'env_var.public' => true
|
||||
}
|
||||
end
|
||||
|
||||
before { post("/v3/repo/#{repo.id}/env_vars", JSON.generate(params), auth_headers.merge(json_headers)) }
|
||||
|
||||
example { expect(last_response.status).to eq 201 }
|
||||
example do
|
||||
response = JSON.load(body)
|
||||
expect(response).to include(
|
||||
'@type' => 'env_var',
|
||||
'@representation' => 'standard',
|
||||
'name' => 'FOO',
|
||||
'value' => 'bar',
|
||||
'public' => true
|
||||
)
|
||||
expect(response).to include('@href', 'id')
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
59
spec/v3/services/env_vars/for_repository_spec.rb
Normal file
59
spec/v3/services/env_vars/for_repository_spec.rb
Normal file
|
@ -0,0 +1,59 @@
|
|||
require 'spec_helper'
|
||||
|
||||
describe Travis::API::V3::Services::EnvVars::ForRepository, set_app: true do
|
||||
let(:repo) { Travis::API::V3::Models::Repository.where(owner_name: 'svenfuchs', name: 'minimal').first_or_create }
|
||||
let(:token) { Travis::Api::App::AccessToken.create(user: repo.owner, app_id: 1) }
|
||||
let(:env_var) { { id: 'abc', name: 'FOO', value: Travis::Settings::EncryptedValue.new('bar'), public: true, repository_id: repo.id } }
|
||||
let(:auth_headers) { { 'HTTP_AUTHORIZATION' => "token #{token}" } }
|
||||
|
||||
describe 'not authenticated' do
|
||||
before { get("/v3/repo/#{repo.id}/env_vars") }
|
||||
include_examples 'not authenticated'
|
||||
end
|
||||
|
||||
describe 'authenticated, missing repo' do
|
||||
before { get("/v3/repo/999999999/env_vars", {}, auth_headers) }
|
||||
include_examples 'missing repo'
|
||||
end
|
||||
|
||||
describe 'authenticated, existing repo, no env vars' do
|
||||
before do
|
||||
get("/v3/repo/#{repo.id}/env_vars", {}, auth_headers)
|
||||
end
|
||||
example { expect(last_response.status).to eq(200) }
|
||||
example do
|
||||
expect(JSON.load(body)).to eq(
|
||||
'@type' => 'env_vars',
|
||||
'@href' => "/v3/repo/#{repo.id}/env_vars",
|
||||
'@representation' => 'standard',
|
||||
'env_vars' => []
|
||||
)
|
||||
end
|
||||
end
|
||||
|
||||
describe 'authenticated, existing repo, existing env vars' do
|
||||
before do
|
||||
repo.update_attributes(settings: JSON.generate(env_vars: [env_var]))
|
||||
get("/v3/repo/#{repo.id}/env_vars", {}, auth_headers)
|
||||
end
|
||||
example { expect(last_response.status).to eq(200) }
|
||||
example do
|
||||
expect(JSON.load(body)).to eq(
|
||||
'@type' => 'env_vars',
|
||||
'@href' => "/v3/repo/#{repo.id}/env_vars",
|
||||
'@representation' => 'standard',
|
||||
'env_vars' => [
|
||||
{
|
||||
'@type' => 'env_var',
|
||||
'@href' => "/v3/repo/#{repo.id}/env_var/#{env_var[:id]}",
|
||||
'@representation' => 'standard',
|
||||
'id' => env_var[:id],
|
||||
'name' => env_var[:name],
|
||||
'value' => env_var[:value].decrypt,
|
||||
'public' => env_var[:public]
|
||||
}
|
||||
]
|
||||
)
|
||||
end
|
||||
end
|
||||
end
|
|
@ -7,14 +7,7 @@ describe Travis::API::V3::Services::Settings, set_app: true do
|
|||
describe :Find do
|
||||
describe 'not authenticated' do
|
||||
before { get("/v3/repo/#{repo.id}/settings") }
|
||||
example { expect(last_response.status).to eq(403) }
|
||||
example do
|
||||
expect(JSON.load(body)).to eq(
|
||||
'@type' => 'error',
|
||||
'error_type' => 'login_required',
|
||||
'error_message' => 'login required'
|
||||
)
|
||||
end
|
||||
include_examples 'not authenticated'
|
||||
end
|
||||
|
||||
describe 'authenticated, missing repo' do
|
||||
|
|
Loading…
Reference in New Issue
Block a user