mirror of
https://github.com/internetee/registry.git
synced 2025-07-27 13:06:18 +02:00
Merge branch 'master' of github.com:internetee/registry
Conflicts: app/models/contact.rb db/schema.rb
This commit is contained in:
Andres Keskküla
commit
897ead3391
66 changed files with 1173 additions and 409 deletions
10
.rubocop-guard.yml
Normal file
10
.rubocop-guard.yml
Normal file
|
|
@ -0,0 +1,10 @@
|
||||||
|
inherit_from: .rubocop.yml
|
||||||
|
|
||||||
|
#
|
||||||
|
# Turn off during guard runs
|
||||||
|
#
|
||||||
|
|
||||||
|
# turn off comment intention check during development
|
||||||
|
# because NerdCommenter honors commented code intentions
|
||||||
|
Style/CommentIndentation:
|
||||||
|
Enabled: false
|
||||||
27
.rubocop.yml
27
.rubocop.yml
|
|
@ -14,6 +14,12 @@ AllCops:
|
||||||
Metrics/LineLength:
|
Metrics/LineLength:
|
||||||
Max: 120
|
Max: 120
|
||||||
|
|
||||||
|
Metrics/MethodLength:
|
||||||
|
Max: 25 # default 10
|
||||||
|
|
||||||
|
Metrics/ClassLength:
|
||||||
|
Max: 300
|
||||||
|
|
||||||
Documentation:
|
Documentation:
|
||||||
Enabled: false
|
Enabled: false
|
||||||
|
|
||||||
|
|
@ -29,11 +35,30 @@ Style/BracesAroundHashParameters:
|
||||||
Style/IndentHash:
|
Style/IndentHash:
|
||||||
Enabled: false
|
Enabled: false
|
||||||
|
|
||||||
|
# a bit too annoying requirement, no big drawback yet dedected
|
||||||
|
Style/TrailingWhitespace:
|
||||||
|
Enabled: false
|
||||||
|
|
||||||
|
# allow == operator used in void context in specs
|
||||||
|
Void:
|
||||||
|
Exclude:
|
||||||
|
- 'spec/**/*'
|
||||||
|
|
||||||
|
# allow should == nil in spec
|
||||||
|
Style/NilComparison:
|
||||||
|
Exclude:
|
||||||
|
- 'spec/**/*'
|
||||||
|
|
||||||
# No need to force reduce to use |a, e| as parameters.
|
# No need to force reduce to use |a, e| as parameters.
|
||||||
# Configuration parameters: Methods.
|
# Configuration parameters: Methods.
|
||||||
Style/SingleLineBlockParams:
|
Style/SingleLineBlockParams:
|
||||||
Enabled: false
|
Enabled: false
|
||||||
|
|
||||||
# No need for nested module/class definition as far as I know
|
# allow prefix for models and controllers,
|
||||||
|
# otherwise we have to intent all body 4 spaces
|
||||||
Style/ClassAndModuleChildren:
|
Style/ClassAndModuleChildren:
|
||||||
Enabled: false
|
Enabled: false
|
||||||
|
|
||||||
|
# Allow to use Estonian terms/data in comments
|
||||||
|
Style/AsciiComments:
|
||||||
|
Enabled: false
|
||||||
|
|
|
||||||
58
Gemfile
58
Gemfile
|
|
@ -64,30 +64,8 @@ gem 'paper_trail', '~> 3.0.5'
|
||||||
# for select
|
# for select
|
||||||
gem 'selectize-rails', '~> 0.11.0'
|
gem 'selectize-rails', '~> 0.11.0'
|
||||||
|
|
||||||
group :assets do
|
|
||||||
# See https://github.com/sstephenson/execjs#readme for more supported runtimes
|
# See https://github.com/sstephenson/execjs#readme for more supported runtimes
|
||||||
gem 'therubyracer', platforms: :ruby
|
gem 'therubyracer', platforms: :ruby
|
||||||
end
|
|
||||||
|
|
||||||
group :development do
|
|
||||||
# faster dev load time
|
|
||||||
gem 'unicorn'
|
|
||||||
|
|
||||||
# Spring speeds up development by keeping your application running in the background.
|
|
||||||
# Read more: https://github.com/rails/spring
|
|
||||||
gem 'spring'
|
|
||||||
|
|
||||||
# bundle exec rake doc:rails generates the API under doc/api.
|
|
||||||
gem 'sdoc', '~> 0.4.0'
|
|
||||||
|
|
||||||
# run tests automatically
|
|
||||||
gem 'guard', '~> 2.6.1'
|
|
||||||
|
|
||||||
# rspec support for guard
|
|
||||||
gem 'guard-rspec', '~> 4.3.1'
|
|
||||||
# rubocop support for guard
|
|
||||||
gem 'guard-rubocop', '~> 1.1.0'
|
|
||||||
end
|
|
||||||
|
|
||||||
group :development, :test do
|
group :development, :test do
|
||||||
gem 'capybara', '~> 2.4.1'
|
gem 'capybara', '~> 2.4.1'
|
||||||
|
|
@ -123,5 +101,39 @@ group :development, :test do
|
||||||
gem 'uuidtools', '~> 2.1.4'
|
gem 'uuidtools', '~> 2.1.4'
|
||||||
|
|
||||||
# For code review
|
# For code review
|
||||||
gem 'simplecov', '~> 0.9.1', :require => false
|
gem 'simplecov', '~> 0.9.1', require: false
|
||||||
|
gem 'rubycritic', '~> 1.1.1'
|
||||||
|
|
||||||
|
# for finding database optimizations
|
||||||
|
gem 'bullet', '~> 4.14.0'
|
||||||
|
|
||||||
|
# for finding future vulnerable gems
|
||||||
|
gem 'bundler-audit'
|
||||||
|
|
||||||
|
# for security audit'
|
||||||
|
gem 'brakeman', '~> 2.6.2', require: false
|
||||||
|
|
||||||
|
# Spring speeds up development by keeping your application running in the background.
|
||||||
|
# Read more: https://github.com/rails/spring
|
||||||
|
gem 'spring'
|
||||||
|
|
||||||
|
# bundle exec rake doc:rails generates the API under doc/api.
|
||||||
|
gem 'sdoc', '~> 0.4.0'
|
||||||
|
|
||||||
|
# run tests automatically
|
||||||
|
gem 'guard', '~> 2.6.1'
|
||||||
|
|
||||||
|
# rspec support for guard
|
||||||
|
gem 'guard-rspec', '~> 4.3.1'
|
||||||
|
gem 'rubocop', '~> 0.26.1'
|
||||||
|
gem 'guard-rubocop', '~> 1.1.0'
|
||||||
|
|
||||||
|
# for quick debugging
|
||||||
|
gem 'web-console', '~> 2.0.0.beta4'
|
||||||
|
|
||||||
|
# for finding dead routes and unused actions
|
||||||
|
gem 'traceroute', '~> 0.4.0'
|
||||||
|
|
||||||
|
# faster dev load time
|
||||||
|
gem 'unicorn'
|
||||||
end
|
end
|
||||||
|
|
|
||||||
109
Gemfile.lock
109
Gemfile.lock
|
|
@ -31,12 +31,35 @@ GEM
|
||||||
ast (2.0.0)
|
ast (2.0.0)
|
||||||
astrolabe (1.3.0)
|
astrolabe (1.3.0)
|
||||||
parser (>= 2.2.0.pre.3, < 3.0)
|
parser (>= 2.2.0.pre.3, < 3.0)
|
||||||
|
axiom-types (0.1.1)
|
||||||
|
descendants_tracker (~> 0.0.4)
|
||||||
|
ice_nine (~> 0.11.0)
|
||||||
|
thread_safe (~> 0.3, >= 0.3.1)
|
||||||
bcrypt (3.1.7)
|
bcrypt (3.1.7)
|
||||||
|
binding_of_caller (0.7.3.pre1)
|
||||||
|
debug_inspector (>= 0.0.1)
|
||||||
bootstrap-sass (3.2.0.2)
|
bootstrap-sass (3.2.0.2)
|
||||||
sass (~> 3.2)
|
sass (~> 3.2)
|
||||||
|
brakeman (2.6.2)
|
||||||
|
erubis (~> 2.6)
|
||||||
|
fastercsv (~> 1.5)
|
||||||
|
haml (>= 3.0, < 5.0)
|
||||||
|
highline (~> 1.6.20)
|
||||||
|
multi_json (~> 1.2)
|
||||||
|
ruby2ruby (~> 2.1.1)
|
||||||
|
ruby_parser (~> 3.5.0)
|
||||||
|
sass (~> 3.0)
|
||||||
|
slim (>= 1.3.6, < 3.0)
|
||||||
|
terminal-table (~> 1.4)
|
||||||
builder (3.2.2)
|
builder (3.2.2)
|
||||||
|
bullet (4.14.0)
|
||||||
|
activesupport (>= 3.0.0)
|
||||||
|
uniform_notifier (>= 1.6.0)
|
||||||
|
bundler-audit (0.3.1)
|
||||||
|
bundler (~> 1.2)
|
||||||
|
thor (~> 0.18)
|
||||||
cancan (1.6.10)
|
cancan (1.6.10)
|
||||||
capybara (2.4.1)
|
capybara (2.4.3)
|
||||||
mime-types (>= 1.16)
|
mime-types (>= 1.16)
|
||||||
nokogiri (>= 1.3.3)
|
nokogiri (>= 1.3.3)
|
||||||
rack (>= 1.0.0)
|
rack (>= 1.0.0)
|
||||||
|
|
@ -46,14 +69,19 @@ GEM
|
||||||
timers (~> 4.0.0)
|
timers (~> 4.0.0)
|
||||||
cliver (0.3.2)
|
cliver (0.3.2)
|
||||||
coderay (1.1.0)
|
coderay (1.1.0)
|
||||||
|
coercible (1.0.0)
|
||||||
|
descendants_tracker (~> 0.0.1)
|
||||||
coffee-rails (4.0.1)
|
coffee-rails (4.0.1)
|
||||||
coffee-script (>= 2.2.0)
|
coffee-script (>= 2.2.0)
|
||||||
railties (>= 4.0.0, < 5.0)
|
railties (>= 4.0.0, < 5.0)
|
||||||
coffee-script (2.3.0)
|
coffee-script (2.3.0)
|
||||||
coffee-script-source
|
coffee-script-source
|
||||||
execjs
|
execjs
|
||||||
coffee-script-source (1.7.0)
|
coffee-script-source (1.8.0)
|
||||||
database_cleaner (1.3.0)
|
database_cleaner (1.3.0)
|
||||||
|
debug_inspector (0.0.2)
|
||||||
|
descendants_tracker (0.0.4)
|
||||||
|
thread_safe (~> 0.3, >= 0.3.1)
|
||||||
devise (3.3.0)
|
devise (3.3.0)
|
||||||
bcrypt (~> 3.0)
|
bcrypt (~> 3.0)
|
||||||
orm_adapter (~> 0.1)
|
orm_adapter (~> 0.1)
|
||||||
|
|
@ -65,12 +93,20 @@ GEM
|
||||||
epp (1.4.0)
|
epp (1.4.0)
|
||||||
hpricot
|
hpricot
|
||||||
libxml-ruby
|
libxml-ruby
|
||||||
|
equalizer (0.0.9)
|
||||||
erubis (2.7.0)
|
erubis (2.7.0)
|
||||||
execjs (2.2.1)
|
execjs (2.2.1)
|
||||||
fabrication (2.11.3)
|
fabrication (2.11.3)
|
||||||
faker (1.3.0)
|
faker (1.3.0)
|
||||||
i18n (~> 0.5)
|
i18n (~> 0.5)
|
||||||
ffi (1.9.3)
|
fastercsv (1.5.5)
|
||||||
|
ffi (1.9.6)
|
||||||
|
flay (2.4.0)
|
||||||
|
ruby_parser (~> 3.0)
|
||||||
|
sexp_processor (~> 4.0)
|
||||||
|
flog (4.2.1)
|
||||||
|
ruby_parser (~> 3.1, > 3.1.0)
|
||||||
|
sexp_processor (~> 4.4)
|
||||||
formatador (0.2.5)
|
formatador (0.2.5)
|
||||||
guard (2.6.1)
|
guard (2.6.1)
|
||||||
formatador (>= 0.2.4)
|
formatador (>= 0.2.4)
|
||||||
|
|
@ -91,12 +127,14 @@ GEM
|
||||||
activesupport (>= 4.0.1)
|
activesupport (>= 4.0.1)
|
||||||
haml (>= 3.1, < 5.0)
|
haml (>= 3.1, < 5.0)
|
||||||
railties (>= 4.0.1)
|
railties (>= 4.0.1)
|
||||||
|
highline (1.6.21)
|
||||||
hike (1.2.3)
|
hike (1.2.3)
|
||||||
hitimes (1.2.2)
|
hitimes (1.2.2)
|
||||||
hpricot (0.8.6)
|
hpricot (0.8.6)
|
||||||
i18n (0.6.11)
|
i18n (0.6.11)
|
||||||
|
ice_nine (0.11.0)
|
||||||
isikukood (0.1.2)
|
isikukood (0.1.2)
|
||||||
jbuilder (2.1.3)
|
jbuilder (2.2.2)
|
||||||
activesupport (>= 3.0.0, < 5)
|
activesupport (>= 3.0.0, < 5)
|
||||||
multi_json (~> 1.2)
|
multi_json (~> 1.2)
|
||||||
jquery-rails (3.1.2)
|
jquery-rails (3.1.2)
|
||||||
|
|
@ -107,9 +145,9 @@ GEM
|
||||||
actionpack (>= 3.0.0)
|
actionpack (>= 3.0.0)
|
||||||
activesupport (>= 3.0.0)
|
activesupport (>= 3.0.0)
|
||||||
kgio (2.9.2)
|
kgio (2.9.2)
|
||||||
libv8 (3.16.14.5)
|
libv8 (3.16.14.7)
|
||||||
libxml-ruby (2.7.0)
|
libxml-ruby (2.7.0)
|
||||||
listen (2.7.9)
|
listen (2.7.11)
|
||||||
celluloid (>= 0.15.2)
|
celluloid (>= 0.15.2)
|
||||||
rb-fsevent (>= 0.9.3)
|
rb-fsevent (>= 0.9.3)
|
||||||
rb-inotify (>= 0.9)
|
rb-inotify (>= 0.9)
|
||||||
|
|
@ -120,16 +158,16 @@ GEM
|
||||||
method_source (0.8.2)
|
method_source (0.8.2)
|
||||||
mime-types (1.25.1)
|
mime-types (1.25.1)
|
||||||
mini_portile (0.6.0)
|
mini_portile (0.6.0)
|
||||||
minitest (5.4.1)
|
minitest (5.4.2)
|
||||||
multi_json (1.10.1)
|
multi_json (1.10.1)
|
||||||
nokogiri (1.6.2.1)
|
nokogiri (1.6.2.1)
|
||||||
mini_portile (= 0.6.0)
|
mini_portile (= 0.6.0)
|
||||||
nprogress-rails (0.1.3.1)
|
nprogress-rails (0.1.3.1)
|
||||||
orm_adapter (0.5.0)
|
orm_adapter (0.5.0)
|
||||||
paper_trail (3.0.5)
|
paper_trail (3.0.6)
|
||||||
activerecord (>= 3.0, < 5.0)
|
activerecord (>= 3.0, < 5.0)
|
||||||
activesupport (>= 3.0, < 5.0)
|
activesupport (>= 3.0, < 5.0)
|
||||||
parser (2.2.0.pre.4)
|
parser (2.2.0.pre.5)
|
||||||
ast (>= 1.1, < 3.0)
|
ast (>= 1.1, < 3.0)
|
||||||
slop (~> 3.4, >= 3.4.5)
|
slop (~> 3.4, >= 3.4.5)
|
||||||
pg (0.17.1)
|
pg (0.17.1)
|
||||||
|
|
@ -181,6 +219,11 @@ GEM
|
||||||
ffi (>= 0.5.0)
|
ffi (>= 0.5.0)
|
||||||
rdoc (4.1.2)
|
rdoc (4.1.2)
|
||||||
json (~> 1.4)
|
json (~> 1.4)
|
||||||
|
reek (1.3.8)
|
||||||
|
rainbow (>= 1.99, < 3.0)
|
||||||
|
ruby2ruby (>= 2.0.8, < 3.0)
|
||||||
|
ruby_parser (~> 3.3)
|
||||||
|
sexp_processor
|
||||||
ref (1.0.5)
|
ref (1.0.5)
|
||||||
rspec (3.0.0)
|
rspec (3.0.0)
|
||||||
rspec-core (~> 3.0.0)
|
rspec-core (~> 3.0.0)
|
||||||
|
|
@ -202,13 +245,25 @@ GEM
|
||||||
rspec-mocks (~> 3.0.0)
|
rspec-mocks (~> 3.0.0)
|
||||||
rspec-support (~> 3.0.0)
|
rspec-support (~> 3.0.0)
|
||||||
rspec-support (3.0.4)
|
rspec-support (3.0.4)
|
||||||
rubocop (0.26.0)
|
rubocop (0.26.1)
|
||||||
astrolabe (~> 1.3)
|
astrolabe (~> 1.3)
|
||||||
parser (>= 2.2.0.pre.4, < 3.0)
|
parser (>= 2.2.0.pre.4, < 3.0)
|
||||||
powerpack (~> 0.0.6)
|
powerpack (~> 0.0.6)
|
||||||
rainbow (>= 1.99.1, < 3.0)
|
rainbow (>= 1.99.1, < 3.0)
|
||||||
ruby-progressbar (~> 1.4)
|
ruby-progressbar (~> 1.4)
|
||||||
ruby-progressbar (1.5.1)
|
ruby-progressbar (1.6.0)
|
||||||
|
ruby2ruby (2.1.3)
|
||||||
|
ruby_parser (~> 3.1)
|
||||||
|
sexp_processor (~> 4.0)
|
||||||
|
ruby_parser (3.5.0)
|
||||||
|
sexp_processor (~> 4.1)
|
||||||
|
rubycritic (1.1.1)
|
||||||
|
flay (= 2.4.0)
|
||||||
|
flog (= 4.2.1)
|
||||||
|
parser (~> 2.1)
|
||||||
|
reek (= 1.3.8)
|
||||||
|
ruby2ruby (>= 2.1.1, < 3.0)
|
||||||
|
virtus (~> 1.0)
|
||||||
sass (3.2.19)
|
sass (3.2.19)
|
||||||
sass-rails (4.0.3)
|
sass-rails (4.0.3)
|
||||||
railties (>= 4.0.0, < 5.0)
|
railties (>= 4.0.0, < 5.0)
|
||||||
|
|
@ -219,6 +274,7 @@ GEM
|
||||||
json (~> 1.7, >= 1.7.7)
|
json (~> 1.7, >= 1.7.7)
|
||||||
rdoc (~> 4.0)
|
rdoc (~> 4.0)
|
||||||
selectize-rails (0.11.0)
|
selectize-rails (0.11.0)
|
||||||
|
sexp_processor (4.4.4)
|
||||||
shoulda-matchers (2.6.2)
|
shoulda-matchers (2.6.2)
|
||||||
activesupport (>= 3.0.0)
|
activesupport (>= 3.0.0)
|
||||||
simplecov (0.9.1)
|
simplecov (0.9.1)
|
||||||
|
|
@ -227,9 +283,12 @@ GEM
|
||||||
simplecov-html (~> 0.8.0)
|
simplecov-html (~> 0.8.0)
|
||||||
simplecov-html (0.8.0)
|
simplecov-html (0.8.0)
|
||||||
simpleidn (0.0.5)
|
simpleidn (0.0.5)
|
||||||
|
slim (2.0.3)
|
||||||
|
temple (~> 0.6.6)
|
||||||
|
tilt (>= 1.3.3, < 2.1)
|
||||||
slop (3.6.0)
|
slop (3.6.0)
|
||||||
spring (1.1.3)
|
spring (1.1.3)
|
||||||
sprockets (2.11.0)
|
sprockets (2.8.0)
|
||||||
hike (~> 1.2)
|
hike (~> 1.2)
|
||||||
multi_json (~> 1.0)
|
multi_json (~> 1.0)
|
||||||
rack (~> 1.0)
|
rack (~> 1.0)
|
||||||
|
|
@ -240,6 +299,8 @@ GEM
|
||||||
sprockets (~> 2.8)
|
sprockets (~> 2.8)
|
||||||
sys-uname (0.9.0)
|
sys-uname (0.9.0)
|
||||||
ffi (>= 1.0.0)
|
ffi (>= 1.0.0)
|
||||||
|
temple (0.6.8)
|
||||||
|
terminal-table (1.4.5)
|
||||||
therubyracer (0.12.1)
|
therubyracer (0.12.1)
|
||||||
libv8 (~> 3.16.14.0)
|
libv8 (~> 3.16.14.0)
|
||||||
ref
|
ref
|
||||||
|
|
@ -248,10 +309,12 @@ GEM
|
||||||
tilt (1.4.1)
|
tilt (1.4.1)
|
||||||
timers (4.0.1)
|
timers (4.0.1)
|
||||||
hitimes
|
hitimes
|
||||||
|
traceroute (0.4.0)
|
||||||
|
rails (>= 3.0.0)
|
||||||
treetop (1.4.15)
|
treetop (1.4.15)
|
||||||
polyglot
|
polyglot
|
||||||
polyglot (>= 0.3.1)
|
polyglot (>= 0.3.1)
|
||||||
turbolinks (2.3.0)
|
turbolinks (2.4.0)
|
||||||
coffee-rails
|
coffee-rails
|
||||||
tzinfo (1.2.2)
|
tzinfo (1.2.2)
|
||||||
thread_safe (~> 0.1)
|
thread_safe (~> 0.1)
|
||||||
|
|
@ -262,10 +325,21 @@ GEM
|
||||||
kgio (~> 2.6)
|
kgio (~> 2.6)
|
||||||
rack
|
rack
|
||||||
raindrops (~> 0.7)
|
raindrops (~> 0.7)
|
||||||
|
uniform_notifier (1.6.2)
|
||||||
uuidtools (2.1.5)
|
uuidtools (2.1.5)
|
||||||
|
virtus (1.0.3)
|
||||||
|
axiom-types (~> 0.1)
|
||||||
|
coercible (~> 1.0)
|
||||||
|
descendants_tracker (~> 0.0, >= 0.0.3)
|
||||||
|
equalizer (~> 0.0, >= 0.0.9)
|
||||||
warden (1.2.3)
|
warden (1.2.3)
|
||||||
rack (>= 1.0)
|
rack (>= 1.0)
|
||||||
websocket-driver (0.3.4)
|
web-console (2.0.0.beta4)
|
||||||
|
activemodel (~> 4.0)
|
||||||
|
binding_of_caller (= 0.7.3.pre1)
|
||||||
|
railties (~> 4.0)
|
||||||
|
sprockets-rails (>= 2.0, < 4.0)
|
||||||
|
websocket-driver (0.3.5)
|
||||||
xpath (2.0.0)
|
xpath (2.0.0)
|
||||||
nokogiri (~> 1.3)
|
nokogiri (~> 1.3)
|
||||||
|
|
||||||
|
|
@ -274,6 +348,9 @@ PLATFORMS
|
||||||
|
|
||||||
DEPENDENCIES
|
DEPENDENCIES
|
||||||
bootstrap-sass (~> 3.2.0.1)
|
bootstrap-sass (~> 3.2.0.1)
|
||||||
|
brakeman (~> 2.6.2)
|
||||||
|
bullet (~> 4.14.0)
|
||||||
|
bundler-audit
|
||||||
cancan (~> 1.6.10)
|
cancan (~> 1.6.10)
|
||||||
capybara (~> 2.4.1)
|
capybara (~> 2.4.1)
|
||||||
coffee-rails (~> 4.0.0)
|
coffee-rails (~> 4.0.0)
|
||||||
|
|
@ -301,6 +378,8 @@ DEPENDENCIES
|
||||||
rails (= 4.1.4)
|
rails (= 4.1.4)
|
||||||
ransack (~> 1.3.0)
|
ransack (~> 1.3.0)
|
||||||
rspec-rails (~> 3.0.2)
|
rspec-rails (~> 3.0.2)
|
||||||
|
rubocop (~> 0.26.1)
|
||||||
|
rubycritic (~> 1.1.1)
|
||||||
sass-rails (~> 4.0.3)
|
sass-rails (~> 4.0.3)
|
||||||
sdoc (~> 0.4.0)
|
sdoc (~> 0.4.0)
|
||||||
selectize-rails (~> 0.11.0)
|
selectize-rails (~> 0.11.0)
|
||||||
|
|
@ -309,7 +388,9 @@ DEPENDENCIES
|
||||||
simpleidn (~> 0.0.5)
|
simpleidn (~> 0.0.5)
|
||||||
spring
|
spring
|
||||||
therubyracer
|
therubyracer
|
||||||
|
traceroute (~> 0.4.0)
|
||||||
turbolinks
|
turbolinks
|
||||||
uglifier (>= 1.3.0)
|
uglifier (>= 1.3.0)
|
||||||
unicorn
|
unicorn
|
||||||
uuidtools (~> 2.1.4)
|
uuidtools (~> 2.1.4)
|
||||||
|
web-console (~> 2.0.0.beta4)
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
group :red_green_refactor, halt_on_fail: true do
|
group :red_green_refactor, halt_on_fail: true do
|
||||||
guard :rspec, cmd: 'bundle exec rspec' do
|
guard :rspec, cmd: 'bundle exec rspec', notification: false do
|
||||||
watch(%r{^spec/.+_spec\.rb$})
|
watch(%r{^spec/.+_spec\.rb$})
|
||||||
watch(%r{^lib/(.+)\.rb$}) { |m| "spec/lib/#{m[1]}_spec.rb" }
|
watch(%r{^lib/(.+)\.rb$}) { |m| "spec/lib/#{m[1]}_spec.rb" }
|
||||||
watch('spec/spec_helper.rb') { "spec" }
|
watch('spec/spec_helper.rb') { "spec" }
|
||||||
|
|
@ -26,9 +26,10 @@ group :red_green_refactor, halt_on_fail:true do
|
||||||
|
|
||||||
# Martin does not want rubocop
|
# Martin does not want rubocop
|
||||||
unless Socket.gethostname == 'martin'
|
unless Socket.gethostname == 'martin'
|
||||||
guard :rubocop do
|
guard :rubocop, cli: '--display-cop-names -c .rubocop-guard.yml', notification: false do
|
||||||
watch(%r{.+\.rb$})
|
watch(%r{.+\.rb$})
|
||||||
watch(%r{(?:.+/)?\.rubocop\.yml$}) { |m| File.dirname(m[0]) }
|
watch(%r{(?:.+/)?\.rubocop\.yml$}) { |m| File.dirname(m[0]) }
|
||||||
|
watch(%r{(?:.+/)?\.rubocop-guard\.yml$}) { |m| File.dirname(m[0]) }
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -11,6 +11,7 @@ class Admin::ContactVersionsController < AdminController
|
||||||
end
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|
||||||
def set_contact
|
def set_contact
|
||||||
@contact = Contact.find(params[:id])
|
@contact = Contact.find(params[:id])
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -11,6 +11,7 @@ class Admin::DomainVersionsController < AdminController
|
||||||
end
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|
||||||
def set_domain
|
def set_domain
|
||||||
@domain = Domain.find(params[:id])
|
@domain = Domain.find(params[:id])
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -53,6 +53,7 @@ class Admin::UsersController < AdminController
|
||||||
end
|
end
|
||||||
|
|
||||||
def user_params
|
def user_params
|
||||||
params.require(:user).permit(:username, :password, :identity_code, :email, :registrar_id, :admin, :registrar_typeahead, :country_id)
|
params.require(:user).permit(:username, :password, :identity_code, :email, :registrar_id,
|
||||||
|
:admin, :registrar_typeahead, :country_id)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -12,10 +12,12 @@ class Client::ContactsController < ClientController
|
||||||
end
|
end
|
||||||
|
|
||||||
def show
|
def show
|
||||||
|
# rubocop: disable Style/GuardClause
|
||||||
if @contact.registrar != current_registrar
|
if @contact.registrar != current_registrar
|
||||||
flash[:alert] = I18n.t('shared.authentication_error')
|
flash[:alert] = I18n.t('shared.authentication_error')
|
||||||
redirect_to client_contacts_path
|
redirect_to client_contacts_path
|
||||||
end
|
end
|
||||||
|
# rubocop: enable Style/GuardClause
|
||||||
end
|
end
|
||||||
|
|
||||||
def create
|
def create
|
||||||
|
|
@ -27,7 +29,7 @@ class Client::ContactsController < ClientController
|
||||||
redirect_to [:client, @contact]
|
redirect_to [:client, @contact]
|
||||||
else
|
else
|
||||||
flash[:alert] = I18n.t('shared.failed_to_create_contact')
|
flash[:alert] = I18n.t('shared.failed_to_create_contact')
|
||||||
render "new"
|
render 'new'
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -12,6 +12,8 @@ class Client::DomainTransfersController < ClientController
|
||||||
@domain_transfer = DomainTransfer.new
|
@domain_transfer = DomainTransfer.new
|
||||||
end
|
end
|
||||||
|
|
||||||
|
# rubocop: disable Metrics/PerceivedComplexity
|
||||||
|
# rubocop: disable Metrics/CyclomaticComplexity
|
||||||
def create
|
def create
|
||||||
@domain_transfer = @domain.pending_transfer
|
@domain_transfer = @domain.pending_transfer
|
||||||
|
|
||||||
|
|
@ -36,6 +38,8 @@ class Client::DomainTransfersController < ClientController
|
||||||
redirect_to [:client, @domain_transfer]
|
redirect_to [:client, @domain_transfer]
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
# rubocop: enable Metrics/PerceivedComplexity
|
||||||
|
# rubocop: enable Metrics/CyclomaticComplexity
|
||||||
|
|
||||||
def approve
|
def approve
|
||||||
if can? :approve_as_client, @domain_transfer
|
if can? :approve_as_client, @domain_transfer
|
||||||
|
|
@ -63,6 +67,8 @@ class Client::DomainTransfersController < ClientController
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
|
|
||||||
|
# rubocop: disable Metrics/PerceivedComplexity
|
||||||
|
# rubocop: disable Metrics/CyclomaticComplexity
|
||||||
def set_domain
|
def set_domain
|
||||||
@domain_transfer = DomainTransfer.new
|
@domain_transfer = DomainTransfer.new
|
||||||
@domain = Domain.find_by(name: params[:domain_name])
|
@domain = Domain.find_by(name: params[:domain_name])
|
||||||
|
|
@ -81,4 +87,6 @@ class Client::DomainTransfersController < ClientController
|
||||||
render 'new'
|
render 'new'
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
# rubocop: enbale Metrics/PerceivedComplexity
|
||||||
|
# rubocop: enable Metrics/CyclomaticComplexity
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -14,7 +14,9 @@ module Epp::Common
|
||||||
end
|
end
|
||||||
|
|
||||||
def proxy
|
def proxy
|
||||||
@svTRID = "ccReg-#{'%010d' % rand(10**10)}"
|
# rubocop: disable Style/VariableName
|
||||||
|
@svTRID = "ccReg-#{format('%010d', rand(10**10))}"
|
||||||
|
# rubocop: enable Style/VariableName
|
||||||
send(params[:command])
|
send(params[:command])
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
@ -46,7 +48,10 @@ module Epp::Common
|
||||||
end
|
end
|
||||||
|
|
||||||
# for debugging
|
# for debugging
|
||||||
@errors << { code: '1', msg: 'handle_errors was executed when there were actually no errors' } if @errors.blank?
|
@errors << {
|
||||||
|
code: '1',
|
||||||
|
msg: 'handle_errors was executed when there were actually no errors'
|
||||||
|
} if @errors.blank?
|
||||||
|
|
||||||
@errors.uniq!
|
@errors.uniq!
|
||||||
|
|
||||||
|
|
@ -60,7 +65,10 @@ module Epp::Common
|
||||||
|
|
||||||
def xml_attrs_present?(ph, attributes)
|
def xml_attrs_present?(ph, attributes)
|
||||||
attributes.each do |x|
|
attributes.each do |x|
|
||||||
epp_errors << { code: '2003', msg: I18n.t('errors.messages.required_parameter_missing', key: x.last) } unless has_attribute(ph, x)
|
epp_errors << {
|
||||||
|
code: '2003',
|
||||||
|
msg: I18n.t('errors.messages.required_parameter_missing', key: x.last)
|
||||||
|
} unless has_attribute(ph, x)
|
||||||
end
|
end
|
||||||
epp_errors.empty?
|
epp_errors.empty?
|
||||||
end
|
end
|
||||||
|
|
@ -68,24 +76,27 @@ module Epp::Common
|
||||||
def xml_attrs_array_present?(array_ph, attributes)
|
def xml_attrs_array_present?(array_ph, attributes)
|
||||||
[array_ph].flatten.each do |ph|
|
[array_ph].flatten.each do |ph|
|
||||||
attributes.each do |x|
|
attributes.each do |x|
|
||||||
unless has_attribute(ph, x)
|
next if has_attribute(ph, x)
|
||||||
epp_errors << { code: '2003', msg: I18n.t('errors.messages.required_parameter_missing', key: x.last) }
|
epp_errors << {
|
||||||
end
|
code: '2003',
|
||||||
|
msg: I18n.t('errors.messages.required_parameter_missing', key: x.last)
|
||||||
|
}
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
epp_errors.empty?
|
epp_errors.empty?
|
||||||
end
|
end
|
||||||
|
|
||||||
|
# rubocop: disable Style/PredicateName
|
||||||
def has_attribute(ph, path)
|
def has_attribute(ph, path)
|
||||||
path.reduce(ph) do |location, key|
|
path.reduce(ph) do |location, key|
|
||||||
location.respond_to?(:keys) ? location[key] : nil
|
location.respond_to?(:keys) ? location[key] : nil
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
# rubocop: enable Style/PredicateName
|
||||||
|
|
||||||
def validate_request
|
def validate_request
|
||||||
validation_method = "validate_#{OBJECT_TYPES[params_hash['epp']['xmlns:ns2']]}_#{params[:command]}_request"
|
validation_method = "validate_#{OBJECT_TYPES[params_hash['epp']['xmlns:ns2']]}_#{params[:command]}_request"
|
||||||
if respond_to?(validation_method, true)
|
return unless respond_to?(validation_method, true)
|
||||||
handle_errors and return unless send(validation_method)
|
handle_errors and return unless send(validation_method)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
|
||||||
|
|
|
||||||
|
|
@ -10,8 +10,7 @@ class SessionsController < Devise::SessionsController
|
||||||
session[:current_user_registrar_id] = Registrar.first.id if @user.admin?
|
session[:current_user_registrar_id] = Registrar.first.id if @user.admin?
|
||||||
|
|
||||||
flash[:notice] = I18n.t('shared.welcome')
|
flash[:notice] = I18n.t('shared.welcome')
|
||||||
sign_in_and_redirect @user, :event => :authentication
|
sign_in_and_redirect @user, event: :authentication
|
||||||
return
|
|
||||||
# end
|
# end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
module ApplicationHelper
|
module ApplicationHelper
|
||||||
def coffee_script_tag(&block)
|
def coffee_script_tag(&block)
|
||||||
content_tag(:script, CoffeeScript.compile(capture(&block)).html_safe, :type => 'text/javascript')
|
content_tag(:script, CoffeeScript.compile(capture(&block)).html_safe, type: 'text/javascript')
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -20,6 +20,7 @@ module Epp::ContactsHelper
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
# rubocop:disable Metrics/CyclomaticComplexity
|
||||||
def delete_contact
|
def delete_contact
|
||||||
@contact = find_contact
|
@contact = find_contact
|
||||||
handle_errors(@contact) and return unless owner?
|
handle_errors(@contact) and return unless owner?
|
||||||
|
|
@ -28,6 +29,7 @@ module Epp::ContactsHelper
|
||||||
|
|
||||||
render '/epp/contacts/delete'
|
render '/epp/contacts/delete'
|
||||||
end
|
end
|
||||||
|
# rubocop:enable Metrics/CyclomaticComplexity
|
||||||
|
|
||||||
def check_contact
|
def check_contact
|
||||||
ph = params_hash['epp']['command']['check']['check']
|
ph = params_hash['epp']['command']['check']['check']
|
||||||
|
|
|
||||||
|
|
@ -4,15 +4,16 @@ module Epp::DomainsHelper
|
||||||
@domain = Epp::EppDomain.new(domain_create_params)
|
@domain = Epp::EppDomain.new(domain_create_params)
|
||||||
|
|
||||||
@domain.parse_and_attach_domain_dependencies(parsed_frame)
|
@domain.parse_and_attach_domain_dependencies(parsed_frame)
|
||||||
|
@domain.parse_and_attach_ds_data(parsed_frame.css('extension create'))
|
||||||
|
|
||||||
if @domain.errors.any?
|
if @domain.errors.any?
|
||||||
handle_errors(@domain)
|
handle_errors(@domain)
|
||||||
raise ActiveRecord::Rollback and return
|
fail ActiveRecord::Rollback and return
|
||||||
end
|
end
|
||||||
|
|
||||||
unless @domain.save
|
unless @domain.save
|
||||||
handle_errors(@domain)
|
handle_errors(@domain)
|
||||||
raise ActiveRecord::Rollback and return
|
fail ActiveRecord::Rollback and return
|
||||||
end
|
end
|
||||||
|
|
||||||
render '/epp/domains/create'
|
render '/epp/domains/create'
|
||||||
|
|
@ -43,6 +44,7 @@ module Epp::DomainsHelper
|
||||||
render '/epp/domains/info'
|
render '/epp/domains/info'
|
||||||
end
|
end
|
||||||
|
|
||||||
|
# rubocop:disable Metrics/CyclomaticComplexity
|
||||||
def update_domain
|
def update_domain
|
||||||
Epp::EppDomain.transaction do
|
Epp::EppDomain.transaction do
|
||||||
@domain = find_domain
|
@domain = find_domain
|
||||||
|
|
@ -50,22 +52,25 @@ module Epp::DomainsHelper
|
||||||
handle_errors(@domain) and return unless @domain
|
handle_errors(@domain) and return unless @domain
|
||||||
|
|
||||||
@domain.parse_and_attach_domain_dependencies(parsed_frame.css('add'))
|
@domain.parse_and_attach_domain_dependencies(parsed_frame.css('add'))
|
||||||
|
@domain.parse_and_attach_ds_data(parsed_frame.css('extension add'))
|
||||||
@domain.parse_and_detach_domain_dependencies(parsed_frame.css('rem'))
|
@domain.parse_and_detach_domain_dependencies(parsed_frame.css('rem'))
|
||||||
|
@domain.parse_and_detach_ds_data(parsed_frame.css('extension rem'))
|
||||||
@domain.parse_and_update_domain_dependencies(parsed_frame.css('chg'))
|
@domain.parse_and_update_domain_dependencies(parsed_frame.css('chg'))
|
||||||
|
|
||||||
if @domain.errors.any?
|
if @domain.errors.any?
|
||||||
handle_errors(@domain)
|
handle_errors(@domain)
|
||||||
raise ActiveRecord::Rollback and return
|
fail ActiveRecord::Rollback and return
|
||||||
end
|
end
|
||||||
|
|
||||||
unless @domain.save
|
unless @domain.save
|
||||||
handle_errors(@domain)
|
handle_errors(@domain)
|
||||||
raise ActiveRecord::Rollback and return
|
fail ActiveRecord::Rollback and return
|
||||||
end
|
end
|
||||||
|
|
||||||
render '/epp/domains/success'
|
render '/epp/domains/success'
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
# rubocop:enable Metrics/CyclomaticComplexity
|
||||||
|
|
||||||
def transfer_domain
|
def transfer_domain
|
||||||
@domain = find_domain(secure: false)
|
@domain = find_domain(secure: false)
|
||||||
|
|
@ -76,6 +81,7 @@ module Epp::DomainsHelper
|
||||||
render '/epp/domains/transfer'
|
render '/epp/domains/transfer'
|
||||||
end
|
end
|
||||||
|
|
||||||
|
# rubocop:disable Metrics/CyclomaticComplexity
|
||||||
def delete_domain
|
def delete_domain
|
||||||
@domain = find_domain
|
@domain = find_domain
|
||||||
|
|
||||||
|
|
@ -85,6 +91,7 @@ module Epp::DomainsHelper
|
||||||
|
|
||||||
render '/epp/domains/success'
|
render '/epp/domains/success'
|
||||||
end
|
end
|
||||||
|
# rubocop:enbale Metrics/CyclomaticComplexity
|
||||||
|
|
||||||
### HELPER METHODS ###
|
### HELPER METHODS ###
|
||||||
|
|
||||||
|
|
@ -94,7 +101,14 @@ module Epp::DomainsHelper
|
||||||
def validate_domain_create_request
|
def validate_domain_create_request
|
||||||
@ph = params_hash['epp']['command']['create']['create']
|
@ph = params_hash['epp']['command']['create']['create']
|
||||||
# TODO: Verify contact presence if registrant is juridical
|
# TODO: Verify contact presence if registrant is juridical
|
||||||
xml_attrs_present?(@ph, [['name'], ['ns'], ['registrant']])
|
attrs_present = xml_attrs_present?(@ph, [['name'], ['ns'], ['registrant']])
|
||||||
|
return false unless attrs_present
|
||||||
|
|
||||||
|
if parsed_frame.css('dsData').count > 0 && parsed_frame.css('create > keyData').count > 0
|
||||||
|
epp_errors << { code: '2306', msg: I18n.t('shared.ds_data_and_key_data_must_not_exists_together') }
|
||||||
|
return false
|
||||||
|
end
|
||||||
|
true
|
||||||
end
|
end
|
||||||
|
|
||||||
def domain_create_params
|
def domain_create_params
|
||||||
|
|
@ -156,12 +170,20 @@ module Epp::DomainsHelper
|
||||||
domain = Epp::EppDomain.find_by(name: @ph[:name])
|
domain = Epp::EppDomain.find_by(name: @ph[:name])
|
||||||
|
|
||||||
unless domain
|
unless domain
|
||||||
epp_errors << { code: '2303', msg: I18n.t('errors.messages.epp_domain_not_found'), value: { obj: 'name', val: @ph[:name] } }
|
epp_errors << {
|
||||||
|
code: '2303',
|
||||||
|
msg: I18n.t('errors.messages.epp_domain_not_found'),
|
||||||
|
value: { obj: 'name', val: @ph[:name] }
|
||||||
|
}
|
||||||
return nil
|
return nil
|
||||||
end
|
end
|
||||||
|
|
||||||
if domain.registrar != current_epp_user.registrar && secure[:secure] == true
|
if domain.registrar != current_epp_user.registrar && secure[:secure] == true
|
||||||
epp_errors << { code: '2302', msg: I18n.t('errors.messages.domain_exists_but_belongs_to_other_registrar'), value: { obj: 'name', val: @ph[:name] } }
|
epp_errors << {
|
||||||
|
code: '2302',
|
||||||
|
msg: I18n.t('errors.messages.domain_exists_but_belongs_to_other_registrar'),
|
||||||
|
value: { obj: 'name', val: @ph[:name] }
|
||||||
|
}
|
||||||
return nil
|
return nil
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,10 @@
|
||||||
class Ability
|
class Ability
|
||||||
include CanCan::Ability
|
include CanCan::Ability
|
||||||
|
|
||||||
|
# rubocop: disable Metrics/MethodLength
|
||||||
|
# rubocop: disable Metrics/CyclomaticComplexity
|
||||||
def initialize(user)
|
def initialize(user)
|
||||||
|
alias_action :create, :read, :update, :destroy, to: :crud
|
||||||
alias_action :create, :read, :update, :destroy, :to => :crud
|
|
||||||
|
|
||||||
user ||= User.new
|
user ||= User.new
|
||||||
|
|
||||||
|
|
@ -67,4 +68,6 @@ class Ability
|
||||||
# See the wiki for details:
|
# See the wiki for details:
|
||||||
# https://github.com/ryanb/cancan/wiki/Defining-Abilities
|
# https://github.com/ryanb/cancan/wiki/Defining-Abilities
|
||||||
end
|
end
|
||||||
|
# rubocop: enable Metrics/MethodLength
|
||||||
|
# rubocop: enable Metrics/CyclomaticComplexity
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -17,12 +17,20 @@ class Address < ActiveRecord::Base
|
||||||
# errors, used = [], []
|
# errors, used = [], []
|
||||||
# parsed_frame.css('postalInfo').each do |pi|
|
# parsed_frame.css('postalInfo').each do |pi|
|
||||||
# attr = pi.attributes['type'].try(:value)
|
# attr = pi.attributes['type'].try(:value)
|
||||||
# errors << { code: 2003, msg: I18n.t('errors.messages.attr_missing', key: 'type') } and next unless attr
|
# errors << {
|
||||||
|
# code: 2003, msg: I18n.t('errors.messages.attr_missing', key: 'type')
|
||||||
|
# } and next unless attr
|
||||||
# unless TYPES.include?(attr)
|
# unless TYPES.include?(attr)
|
||||||
# errors << { code: 2005, msg: I18n.t('errors.messages.invalid_type'), value: { obj: 'type', val: attr } }
|
# errors << {
|
||||||
|
# code: 2005,
|
||||||
|
# msg: I18n.t('errors.messages.invalid_type'), value: { obj: 'type', val: attr }
|
||||||
|
# }
|
||||||
# next
|
# next
|
||||||
# end
|
# end
|
||||||
# errors << { code: 2005, msg: I18n.t('errors.messages.repeating_postal_info') } and next if used.include?(attr)
|
# errors << {
|
||||||
|
# code: 2005,
|
||||||
|
# msg: I18n.t('errors.messages.repeating_postal_info')
|
||||||
|
# } and next if used.include?(attr)
|
||||||
# used << attr
|
# used << attr
|
||||||
# end; errors
|
# end; errors
|
||||||
# end
|
# end
|
||||||
|
|
|
||||||
|
|
@ -33,11 +33,11 @@ module EppErrors
|
||||||
def collect_child_errors(key)
|
def collect_child_errors(key)
|
||||||
macro = self.class.reflect_on_association(key).macro
|
macro = self.class.reflect_on_association(key).macro
|
||||||
multi = [:has_and_belongs_to_many, :has_many]
|
multi = [:has_and_belongs_to_many, :has_many]
|
||||||
single = [:belongs_to, :has_one]
|
# single = [:belongs_to, :has_one]
|
||||||
|
|
||||||
epp_errors = []
|
epp_errors = []
|
||||||
send(key).each do |x|
|
send(key).each do |x|
|
||||||
x.errors.messages.each do |key, values|
|
x.errors.messages.each do |_key, values|
|
||||||
epp_errors << x.collect_parent_errors(values)
|
epp_errors << x.collect_parent_errors(values)
|
||||||
end
|
end
|
||||||
end if multi.include?(macro)
|
end if multi.include?(macro)
|
||||||
|
|
|
||||||
|
|
@ -18,7 +18,5 @@ module UserEvents
|
||||||
def epp_user_events(id)
|
def epp_user_events(id)
|
||||||
where(whodunnit: "#{id}-EppUser")
|
where(whodunnit: "#{id}-EppUser")
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,7 @@ class Contact < ActiveRecord::Base
|
||||||
has_many :domain_contacts
|
has_many :domain_contacts
|
||||||
has_many :domains, through: :domain_contacts
|
has_many :domains, through: :domain_contacts
|
||||||
|
|
||||||
# TODO remove the x_by
|
# TODO: remove the x_by
|
||||||
belongs_to :created_by, class_name: 'EppUser', foreign_key: :created_by_id
|
belongs_to :created_by, class_name: 'EppUser', foreign_key: :created_by_id
|
||||||
belongs_to :updated_by, class_name: 'EppUser', foreign_key: :updated_by_id
|
belongs_to :updated_by, class_name: 'EppUser', foreign_key: :updated_by_id
|
||||||
belongs_to :registrar
|
belongs_to :registrar
|
||||||
|
|
@ -107,7 +107,6 @@ class Contact < ActiveRecord::Base
|
||||||
|
|
||||||
# should use only in transaction
|
# should use only in transaction
|
||||||
def destroy_and_clean
|
def destroy_and_clean
|
||||||
|
|
||||||
if relations_with_domain?
|
if relations_with_domain?
|
||||||
errors.add(:domains, :exist)
|
errors.add(:domains, :exist)
|
||||||
return false
|
return false
|
||||||
|
|
@ -182,6 +181,4 @@ class Contact < ActiveRecord::Base
|
||||||
res.reduce([]) { |o, v| o << { id: v[:id], display_key: "#{v.name} (#{v.code})" } }
|
res.reduce([]) { |o, v| o << { id: v[:id], display_key: "#{v.name} (#{v.code})" } }
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
private
|
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -5,5 +5,4 @@ class ContactVersion < PaperTrail::Version
|
||||||
|
|
||||||
self.table_name = :contact_versions
|
self.table_name = :contact_versions
|
||||||
self.sequence_name = :contact_version_id_seq
|
self.sequence_name = :contact_version_id_seq
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
|
||||||
42
app/models/delegation_signer.rb
Normal file
42
app/models/delegation_signer.rb
Normal file
|
|
@ -0,0 +1,42 @@
|
||||||
|
class DelegationSigner < ActiveRecord::Base
|
||||||
|
include EppErrors
|
||||||
|
has_one :dnskeys
|
||||||
|
|
||||||
|
validate :validate_dnskeys_uniqueness
|
||||||
|
validate :validate_dnskeys_count
|
||||||
|
|
||||||
|
def epp_code_map
|
||||||
|
sg = SettingGroup.domain_validation
|
||||||
|
|
||||||
|
{
|
||||||
|
'2004' => [ # Parameter value range error
|
||||||
|
[:dnskeys, :out_of_range,
|
||||||
|
{
|
||||||
|
min: sg.setting(Setting::DNSKEYS_MIN_COUNT).value,
|
||||||
|
max: sg.setting(Setting::DNSKEYS_MAX_COUNT).value
|
||||||
|
}
|
||||||
|
]
|
||||||
|
]
|
||||||
|
}
|
||||||
|
end
|
||||||
|
|
||||||
|
def validate_dnskeys_count
|
||||||
|
sg = SettingGroup.domain_validation
|
||||||
|
min, max = sg.setting(:dnskeys_min_count).value.to_i, sg.setting(:dnskeys_max_count).value.to_i
|
||||||
|
return if dnskeys.reject(&:marked_for_destruction?).length.between?(min, max)
|
||||||
|
errors.add(:dnskeys, :out_of_range, { min: min, max: max })
|
||||||
|
end
|
||||||
|
|
||||||
|
def validate_dnskeys_uniqueness
|
||||||
|
validated = []
|
||||||
|
list = dnskeys.reject(&:marked_for_destruction?)
|
||||||
|
list.each do |dnskey|
|
||||||
|
next if dnskey.public_key.blank?
|
||||||
|
existing = list.select { |x| x.public_key == dnskey.public_key }
|
||||||
|
next unless existing.length > 1
|
||||||
|
validated << dnskey.public_key
|
||||||
|
errors.add(:dnskeys, :invalid) if errors[:dnskeys].blank?
|
||||||
|
dnskey.errors.add(:public_key, :taken)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
@ -8,6 +8,8 @@ class Dnskey < ActiveRecord::Base
|
||||||
validate :validate_protocol
|
validate :validate_protocol
|
||||||
validate :validate_flags
|
validate :validate_flags
|
||||||
|
|
||||||
|
before_save -> { generate_digest unless ds_digest.present? }
|
||||||
|
|
||||||
ALGORITHMS = %w(3 5 6 7 8 252 253 254 255)
|
ALGORITHMS = %w(3 5 6 7 8 252 253 254 255)
|
||||||
PROTOCOLS = %w(3)
|
PROTOCOLS = %w(3)
|
||||||
FLAGS = %w(0 256 257)
|
FLAGS = %w(0 256 257)
|
||||||
|
|
@ -20,7 +22,7 @@ class Dnskey < ActiveRecord::Base
|
||||||
[:flags, :invalid, { value: { obj: 'flags', val: flags }, values: FLAGS.join(', ') }]
|
[:flags, :invalid, { value: { obj: 'flags', val: flags }, values: FLAGS.join(', ') }]
|
||||||
],
|
],
|
||||||
'2302' => [
|
'2302' => [
|
||||||
[:public_key, :taken, { value: { obj: 'pubKye', val: public_key } }]
|
[:public_key, :taken, { value: { obj: 'pubKey', val: public_key } }]
|
||||||
],
|
],
|
||||||
'2303' => [
|
'2303' => [
|
||||||
[:base, :dnskey_not_found, { value: { obj: 'pubKey', val: public_key } }]
|
[:base, :dnskey_not_found, { value: { obj: 'pubKey', val: public_key } }]
|
||||||
|
|
@ -51,4 +53,40 @@ class Dnskey < ActiveRecord::Base
|
||||||
return if FLAGS.include?(flags.to_s)
|
return if FLAGS.include?(flags.to_s)
|
||||||
errors.add(:flags, :invalid, values: FLAGS.join(', '))
|
errors.add(:flags, :invalid, values: FLAGS.join(', '))
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def generate_digest
|
||||||
|
flags_hex = self.class.int_to_hex(flags)
|
||||||
|
protocol_hex = self.class.int_to_hex(protocol)
|
||||||
|
alg_hex = self.class.int_to_hex(alg)
|
||||||
|
|
||||||
|
hex = [domain.name_in_wire_format, flags_hex, protocol_hex, alg_hex, public_key_hex].join
|
||||||
|
bin = self.class.hex_to_bin(hex)
|
||||||
|
|
||||||
|
sg = SettingGroup.dnskeys.setting(Setting::DS_ALGORITHM).value
|
||||||
|
|
||||||
|
if sg == '1'
|
||||||
|
self.ds_digest = Digest::SHA1.hexdigest(bin).upcase
|
||||||
|
elsif sg == '2'
|
||||||
|
self.ds_digest = Digest::SHA256.hexdigest(bin).upcase
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
def public_key_hex
|
||||||
|
self.class.bin_to_hex(Base64.decode64(public_key))
|
||||||
|
end
|
||||||
|
|
||||||
|
class << self
|
||||||
|
def int_to_hex(s)
|
||||||
|
s = s.to_s(16)
|
||||||
|
s.prepend('0') if s.length.odd?
|
||||||
|
end
|
||||||
|
|
||||||
|
def hex_to_bin(s)
|
||||||
|
s.scan(/../).map(&:hex).pack('c*')
|
||||||
|
end
|
||||||
|
|
||||||
|
def bin_to_hex(s)
|
||||||
|
s.each_byte.map { |b| sprintf('%02X', b) }.join
|
||||||
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
class Domain < ActiveRecord::Base
|
class Domain < ActiveRecord::Base
|
||||||
# TODO whois requests ip whitelist for full info for own domains and partial info for other domains
|
# TODO: whois requests ip whitelist for full info for own domains and partial info for other domains
|
||||||
# TODO most inputs should be trimmed before validatation, probably some global logic?
|
# TODO: most inputs should be trimmed before validatation, probably some global logic?
|
||||||
paginates_per 10 # just for showoff
|
paginates_per 10 # just for showoff
|
||||||
|
|
||||||
belongs_to :registrar
|
belongs_to :registrar
|
||||||
|
|
@ -9,13 +9,13 @@ class Domain < ActiveRecord::Base
|
||||||
has_many :domain_contacts, dependent: :delete_all
|
has_many :domain_contacts, dependent: :delete_all
|
||||||
accepts_nested_attributes_for :domain_contacts, allow_destroy: true
|
accepts_nested_attributes_for :domain_contacts, allow_destroy: true
|
||||||
|
|
||||||
has_many :tech_contacts, -> do
|
has_many :tech_contacts,
|
||||||
where(domain_contacts: { contact_type: DomainContact::TECH })
|
-> { where(domain_contacts: { contact_type: DomainContact::TECH }) },
|
||||||
end, through: :domain_contacts, source: :contact
|
through: :domain_contacts, source: :contact
|
||||||
|
|
||||||
has_many :admin_contacts, -> do
|
has_many :admin_contacts,
|
||||||
where(domain_contacts: { contact_type: DomainContact::ADMIN })
|
-> { where(domain_contacts: { contact_type: DomainContact::ADMIN }) },
|
||||||
end, through: :domain_contacts, source: :contact
|
through: :domain_contacts, source: :contact
|
||||||
|
|
||||||
has_many :nameservers, dependent: :delete_all
|
has_many :nameservers, dependent: :delete_all
|
||||||
accepts_nested_attributes_for :nameservers, allow_destroy: true,
|
accepts_nested_attributes_for :nameservers, allow_destroy: true,
|
||||||
|
|
@ -85,9 +85,9 @@ class Domain < ActiveRecord::Base
|
||||||
|
|
||||||
def name=(value)
|
def name=(value)
|
||||||
value.strip!
|
value.strip!
|
||||||
write_attribute(:name, SimpleIDN.to_unicode(value))
|
self[:name] = SimpleIDN.to_unicode(value)
|
||||||
write_attribute(:name_puny, SimpleIDN.to_ascii(value))
|
self[:name_puny] = SimpleIDN.to_ascii(value)
|
||||||
write_attribute(:name_dirty, value)
|
self[:name_dirty] = value
|
||||||
end
|
end
|
||||||
|
|
||||||
def owner_contact_typeahead
|
def owner_contact_typeahead
|
||||||
|
|
@ -139,7 +139,7 @@ class Domain < ActiveRecord::Base
|
||||||
|
|
||||||
def validate_nameserver_ips
|
def validate_nameserver_ips
|
||||||
nameservers.each do |ns|
|
nameservers.each do |ns|
|
||||||
next if !ns.hostname.end_with?(name)
|
next unless ns.hostname.end_with?(name)
|
||||||
next if ns.ipv4.present?
|
next if ns.ipv4.present?
|
||||||
errors.add(:nameservers, :invalid) if errors[:nameservers].blank?
|
errors.add(:nameservers, :invalid) if errors[:nameservers].blank?
|
||||||
ns.errors.add(:ipv4, :blank)
|
ns.errors.add(:ipv4, :blank)
|
||||||
|
|
@ -231,15 +231,30 @@ class Domain < ActiveRecord::Base
|
||||||
|
|
||||||
## SHARED
|
## SHARED
|
||||||
|
|
||||||
|
def name_in_wire_format
|
||||||
|
res = ''
|
||||||
|
parts = name.split('.')
|
||||||
|
parts.each do |x|
|
||||||
|
res += sprintf('%02X', x.length)
|
||||||
|
res += x.each_byte.map { |b| sprintf('%02X', b) }.join
|
||||||
|
end
|
||||||
|
|
||||||
|
res += '00'
|
||||||
|
|
||||||
|
res
|
||||||
|
end
|
||||||
|
|
||||||
def to_s
|
def to_s
|
||||||
name
|
name
|
||||||
end
|
end
|
||||||
|
|
||||||
|
# rubocop:disable Lint/Loop
|
||||||
def generate_auth_info
|
def generate_auth_info
|
||||||
begin
|
begin
|
||||||
self.auth_info = SecureRandom.hex
|
self.auth_info = SecureRandom.hex
|
||||||
end while self.class.exists?(auth_info: auth_info)
|
end while self.class.exists?(auth_info: auth_info)
|
||||||
end
|
end
|
||||||
|
# rubocop:enable Lint/Loop
|
||||||
|
|
||||||
def attach_default_contacts
|
def attach_default_contacts
|
||||||
tech_contacts << owner_contact if tech_contacts_count.zero?
|
tech_contacts << owner_contact if tech_contacts_count.zero?
|
||||||
|
|
|
||||||
|
|
@ -29,9 +29,26 @@ class DomainStatus < ActiveRecord::Base
|
||||||
DELETE_CANDIDATE = 'deleteCandidate'
|
DELETE_CANDIDATE = 'deleteCandidate'
|
||||||
EXPIRED = 'expired'
|
EXPIRED = 'expired'
|
||||||
|
|
||||||
STATUSES = [CLIENT_DELETE_PROHIBITED, SERVER_DELETE_PROHIBITED, CLIENT_HOLD, SERVER_HOLD, CLIENT_RENEW_PROHIBITED, SERVER_RENEW_PROHIBITED, CLIENT_TRANSFER_PROHIBITED, SERVER_TRANSFER_PROHIBITED, CLIENT_UPDATE_PROHIBITED, SERVER_UPDATE_PROHIBITED, INACTIVE, OK, PENDING_CREATE, PENDING_DELETE, PENDING_RENEW, PENDING_TRANSFER, PENDING_UPDATE, SERVER_MANUAL_INZONE, SERVER_REGISTRANT_CHANGE_PROHIBITED, SERVER_ADMIN_CHANGE_PROHIBITED, SERVER_TECH_CHANGE_PROHIBITED, FORCE_DELETE, DELETE_CANDIDATE, EXPIRED]
|
STATUSES = [
|
||||||
CLIENT_STATUSES = [CLIENT_DELETE_PROHIBITED, CLIENT_HOLD, CLIENT_RENEW_PROHIBITED, CLIENT_TRANSFER_PROHIBITED, CLIENT_UPDATE_PROHIBITED]
|
CLIENT_DELETE_PROHIBITED, SERVER_DELETE_PROHIBITED, CLIENT_HOLD, SERVER_HOLD,
|
||||||
SERVER_STATUSES = [SERVER_DELETE_PROHIBITED, SERVER_HOLD, SERVER_RENEW_PROHIBITED, SERVER_TRANSFER_PROHIBITED, SERVER_UPDATE_PROHIBITED, SERVER_MANUAL_INZONE, SERVER_REGISTRANT_CHANGE_PROHIBITED, SERVER_ADMIN_CHANGE_PROHIBITED, SERVER_TECH_CHANGE_PROHIBITED]
|
CLIENT_RENEW_PROHIBITED, SERVER_RENEW_PROHIBITED, CLIENT_TRANSFER_PROHIBITED,
|
||||||
|
SERVER_TRANSFER_PROHIBITED, CLIENT_UPDATE_PROHIBITED, SERVER_UPDATE_PROHIBITED,
|
||||||
|
INACTIVE, OK, PENDING_CREATE, PENDING_DELETE, PENDING_RENEW, PENDING_TRANSFER,
|
||||||
|
PENDING_UPDATE, SERVER_MANUAL_INZONE, SERVER_REGISTRANT_CHANGE_PROHIBITED,
|
||||||
|
SERVER_ADMIN_CHANGE_PROHIBITED, SERVER_TECH_CHANGE_PROHIBITED, FORCE_DELETE,
|
||||||
|
DELETE_CANDIDATE, EXPIRED
|
||||||
|
]
|
||||||
|
|
||||||
|
CLIENT_STATUSES = [
|
||||||
|
CLIENT_DELETE_PROHIBITED, CLIENT_HOLD, CLIENT_RENEW_PROHIBITED, CLIENT_TRANSFER_PROHIBITED,
|
||||||
|
CLIENT_UPDATE_PROHIBITED
|
||||||
|
]
|
||||||
|
|
||||||
|
SERVER_STATUSES = [
|
||||||
|
SERVER_DELETE_PROHIBITED, SERVER_HOLD, SERVER_RENEW_PROHIBITED, SERVER_TRANSFER_PROHIBITED,
|
||||||
|
SERVER_UPDATE_PROHIBITED, SERVER_MANUAL_INZONE, SERVER_REGISTRANT_CHANGE_PROHIBITED,
|
||||||
|
SERVER_ADMIN_CHANGE_PROHIBITED, SERVER_TECH_CHANGE_PROHIBITED
|
||||||
|
]
|
||||||
|
|
||||||
# archiving
|
# archiving
|
||||||
has_paper_trail class_name: 'DomainStatusVersion'
|
has_paper_trail class_name: 'DomainStatusVersion'
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,4 @@
|
||||||
|
# rubocop: disable Metrics/ClassLength
|
||||||
class Epp::EppDomain < Domain
|
class Epp::EppDomain < Domain
|
||||||
include EppErrors
|
include EppErrors
|
||||||
|
|
||||||
|
|
@ -29,13 +30,13 @@ class Epp::EppDomain < Domain
|
||||||
max: domain_validation_sg.setting(:ns_max_count).value
|
max: domain_validation_sg.setting(:ns_max_count).value
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
|
[:period, :out_of_range, { value: { obj: 'period', val: period } }],
|
||||||
[:dnskeys, :out_of_range,
|
[:dnskeys, :out_of_range,
|
||||||
{
|
{
|
||||||
min: domain_validation_sg.setting(:dnskeys_min_count).value,
|
min: domain_validation_sg.setting(Setting::DNSKEYS_MIN_COUNT).value,
|
||||||
max: domain_validation_sg.setting(:dnskeys_max_count).value
|
max: domain_validation_sg.setting(Setting::DNSKEYS_MAX_COUNT).value
|
||||||
}
|
}
|
||||||
],
|
]
|
||||||
[:period, :out_of_range, { value: { obj: 'period', val: period } }]
|
|
||||||
],
|
],
|
||||||
'2200' => [
|
'2200' => [
|
||||||
[:auth_info, :wrong_pw]
|
[:auth_info, :wrong_pw]
|
||||||
|
|
@ -48,7 +49,6 @@ class Epp::EppDomain < Domain
|
||||||
attach_contacts(self.class.parse_contacts_from_frame(parsed_frame))
|
attach_contacts(self.class.parse_contacts_from_frame(parsed_frame))
|
||||||
attach_nameservers(self.class.parse_nameservers_from_frame(parsed_frame))
|
attach_nameservers(self.class.parse_nameservers_from_frame(parsed_frame))
|
||||||
attach_statuses(self.class.parse_statuses_from_frame(parsed_frame))
|
attach_statuses(self.class.parse_statuses_from_frame(parsed_frame))
|
||||||
attach_dnskeys(self.class.parse_dnskeys_from_frame(parsed_frame))
|
|
||||||
|
|
||||||
errors.empty?
|
errors.empty?
|
||||||
end
|
end
|
||||||
|
|
@ -57,6 +57,17 @@ class Epp::EppDomain < Domain
|
||||||
detach_contacts(self.class.parse_contacts_from_frame(parsed_frame))
|
detach_contacts(self.class.parse_contacts_from_frame(parsed_frame))
|
||||||
detach_nameservers(self.class.parse_nameservers_from_frame(parsed_frame))
|
detach_nameservers(self.class.parse_nameservers_from_frame(parsed_frame))
|
||||||
detach_statuses(self.class.parse_statuses_from_frame(parsed_frame))
|
detach_statuses(self.class.parse_statuses_from_frame(parsed_frame))
|
||||||
|
|
||||||
|
errors.empty?
|
||||||
|
end
|
||||||
|
|
||||||
|
def parse_and_attach_ds_data(parsed_frame)
|
||||||
|
attach_dnskeys(self.class.parse_dnskeys_from_frame(parsed_frame))
|
||||||
|
|
||||||
|
errors.empty?
|
||||||
|
end
|
||||||
|
|
||||||
|
def parse_and_detach_ds_data(parsed_frame)
|
||||||
detach_dnskeys(self.class.parse_dnskeys_from_frame(parsed_frame))
|
detach_dnskeys(self.class.parse_dnskeys_from_frame(parsed_frame))
|
||||||
|
|
||||||
errors.empty?
|
errors.empty?
|
||||||
|
|
@ -71,7 +82,7 @@ class Epp::EppDomain < Domain
|
||||||
|
|
||||||
# TODO: Find out if there are any attributes that can be changed
|
# TODO: Find out if there are any attributes that can be changed
|
||||||
# if not, delete this method
|
# if not, delete this method
|
||||||
def parse_and_update_domain_attributes(parsed_frame)
|
def parse_and_update_domain_attributes(_parsed_frame)
|
||||||
# assign_attributes(self.class.parse_update_params_from_frame(parsed_frame))
|
# assign_attributes(self.class.parse_update_params_from_frame(parsed_frame))
|
||||||
|
|
||||||
errors.empty?
|
errors.empty?
|
||||||
|
|
@ -174,20 +185,74 @@ class Epp::EppDomain < Domain
|
||||||
domain_statuses.delete(to_delete)
|
domain_statuses.delete(to_delete)
|
||||||
end
|
end
|
||||||
|
|
||||||
def attach_dnskeys(dnskey_list)
|
def attach_dnskeys(dnssec_data)
|
||||||
dnskey_list.each do |dnskey_attrs|
|
sg = SettingGroup.dnskeys
|
||||||
dnskeys.build(dnskey_attrs)
|
ds_data_allowed = sg.setting(Setting::ALLOW_DS_DATA).value == '0' ? false : true
|
||||||
|
ds_data_with_keys_allowed = sg.setting(Setting::ALLOW_DS_DATA_WITH_KEYS).value == '0' ? false : true
|
||||||
|
key_data_allowed = sg.setting(Setting::ALLOW_KEY_DATA).value == '0' ? false : true
|
||||||
|
|
||||||
|
if dnssec_data[:ds_data].any? && !ds_data_allowed
|
||||||
|
errors.add(:base, :ds_data_not_allowed)
|
||||||
|
return
|
||||||
|
end
|
||||||
|
|
||||||
|
dnssec_data[:ds_data].each do |ds_data|
|
||||||
|
if ds_data[:public_key] && !ds_data_with_keys_allowed
|
||||||
|
errors.add(:base, :ds_data_with_keys_not_allowed)
|
||||||
|
next
|
||||||
|
else
|
||||||
|
dnskeys.build(ds_data)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
def detach_dnskeys(dnskey_list)
|
if dnssec_data[:key_data].any? && !key_data_allowed
|
||||||
|
errors.add(:base, :key_data_not_allowed)
|
||||||
|
return
|
||||||
|
end
|
||||||
|
|
||||||
|
dnssec_data[:key_data].each do |x|
|
||||||
|
dnskeys.build({
|
||||||
|
ds_key_tag: SecureRandom.hex(5),
|
||||||
|
ds_alg: 3,
|
||||||
|
ds_digest_type: sg.setting(Setting::DS_ALGORITHM).value
|
||||||
|
}.merge(x))
|
||||||
|
end
|
||||||
|
|
||||||
|
errors.any?
|
||||||
|
end
|
||||||
|
|
||||||
|
def detach_dnskeys(dnssec_data)
|
||||||
|
sg = SettingGroup.dnskeys
|
||||||
|
ds_data_allowed = sg.setting(Setting::ALLOW_DS_DATA).value == '0' ? false : true
|
||||||
|
key_data_allowed = sg.setting(Setting::ALLOW_KEY_DATA).value == '0' ? false : true
|
||||||
|
|
||||||
|
if dnssec_data[:ds_data].any? && !ds_data_allowed
|
||||||
|
errors.add(:base, :ds_data_not_allowed)
|
||||||
|
return
|
||||||
|
end
|
||||||
|
|
||||||
to_delete = []
|
to_delete = []
|
||||||
dnskey_list.each do |x|
|
dnssec_data[:ds_data].each do |x|
|
||||||
dnskey = dnskeys.where(public_key: x[:public_key])
|
ds = dnskeys.where(ds_key_tag: x[:ds_key_tag])
|
||||||
if dnskey.blank?
|
if ds.blank?
|
||||||
add_epp_error('2303', 'pubKey', x[:public_key], [:dnskeys, :not_found])
|
add_epp_error('2303', 'keyTag', x[:key_tag], [:dnskeys, :not_found])
|
||||||
else
|
else
|
||||||
to_delete << dnskey
|
to_delete << ds
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
if dnssec_data[:key_data].any? && !key_data_allowed
|
||||||
|
errors.add(:base, :key_data_not_allowed)
|
||||||
|
return
|
||||||
|
end
|
||||||
|
|
||||||
|
to_delete = []
|
||||||
|
dnssec_data[:key_data].each do |x|
|
||||||
|
ds = dnskeys.where(public_key: x[:public_key])
|
||||||
|
if ds.blank?
|
||||||
|
add_epp_error('2303', 'publicKey', x[:public_key], [:dnskeys, :not_found])
|
||||||
|
else
|
||||||
|
to_delete << ds
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
@ -211,6 +276,9 @@ class Epp::EppDomain < Domain
|
||||||
|
|
||||||
### TRANSFER ###
|
### TRANSFER ###
|
||||||
|
|
||||||
|
# rubocop: disable Metrics/PerceivedComplexity
|
||||||
|
# rubocop: disable Metrics/MethodLength
|
||||||
|
# rubocop: disable Metrics/CyclomaticComplexity
|
||||||
def transfer(params)
|
def transfer(params)
|
||||||
return false unless authenticate(params[:pw])
|
return false unless authenticate(params[:pw])
|
||||||
|
|
||||||
|
|
@ -249,6 +317,9 @@ class Epp::EppDomain < Domain
|
||||||
save
|
save
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
# rubocop: enable Metrics/PerceivedComplexity
|
||||||
|
# rubocop: enable Metrics/MethodLength
|
||||||
|
# rubocop: enable Metrics/CyclomaticComplexity
|
||||||
|
|
||||||
def approve_pending_transfer(current_user)
|
def approve_pending_transfer(current_user)
|
||||||
pt = pending_transfer
|
pt = pending_transfer
|
||||||
|
|
@ -358,16 +429,38 @@ class Epp::EppDomain < Domain
|
||||||
end
|
end
|
||||||
|
|
||||||
def parse_dnskeys_from_frame(parsed_frame)
|
def parse_dnskeys_from_frame(parsed_frame)
|
||||||
res = []
|
res = { ds_data: [], key_data: [] }
|
||||||
|
|
||||||
parsed_frame.css('dnskey').each do |x|
|
res[:max_sig_life] = parsed_frame.css('maxSigLife').first.try(:text)
|
||||||
res << {
|
|
||||||
|
parsed_frame.css('dsData').each do |x|
|
||||||
|
data = {
|
||||||
|
ds_key_tag: x.css('keyTag').first.try(:text),
|
||||||
|
ds_alg: x.css('alg').first.try(:text),
|
||||||
|
ds_digest_type: x.css('digestType').first.try(:text),
|
||||||
|
ds_digest: x.css('digest').first.try(:text)
|
||||||
|
}
|
||||||
|
|
||||||
|
kd = x.css('keyData').first
|
||||||
|
data.merge!({
|
||||||
|
flags: kd.css('flags').first.try(:text),
|
||||||
|
protocol: kd.css('protocol').first.try(:text),
|
||||||
|
alg: kd.css('alg').first.try(:text),
|
||||||
|
public_key: kd.css('pubKey').first.try(:text)
|
||||||
|
}) if kd
|
||||||
|
|
||||||
|
res[:ds_data] << data
|
||||||
|
end
|
||||||
|
|
||||||
|
parsed_frame.xpath('keyData').each do |x|
|
||||||
|
res[:key_data] << {
|
||||||
flags: x.css('flags').first.try(:text),
|
flags: x.css('flags').first.try(:text),
|
||||||
protocol: x.css('protocol').first.try(:text),
|
protocol: x.css('protocol').first.try(:text),
|
||||||
alg: x.css('alg').first.try(:text),
|
alg: x.css('alg').first.try(:text),
|
||||||
public_key: x.css('pubKey').first.try(:text)
|
public_key: x.css('pubKey').first.try(:text)
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
|
|
||||||
res
|
res
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
@ -397,3 +490,4 @@ class Epp::EppDomain < Domain
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
# rubocop: enable Metrics/ClassLength
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,13 @@
|
||||||
class EppSession < ActiveRecord::Base
|
class EppSession < ActiveRecord::Base
|
||||||
before_save :marshal_data!
|
before_save :marshal_data!
|
||||||
|
|
||||||
|
# rubocop: disable Rails/ReadWriteAttribute
|
||||||
|
# Turned back to read_attribute, thus in Rails 4
|
||||||
|
# there is differences between self[:data] and read_attribute.
|
||||||
def data
|
def data
|
||||||
@data ||= self.class.unmarshal(read_attribute(:data)) || {}
|
@data ||= self.class.unmarshal(read_attribute(:data)) || {}
|
||||||
end
|
end
|
||||||
|
# rubocop: enable Rails/ReadWriteAttribute
|
||||||
|
|
||||||
def [](key)
|
def [](key)
|
||||||
data[key.to_sym]
|
data[key.to_sym]
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,6 @@
|
||||||
|
# rubocop: disable Metrics/ClassLength
|
||||||
class EppUser < ActiveRecord::Base
|
class EppUser < ActiveRecord::Base
|
||||||
# TODO should have max request limit per day
|
# TODO: should have max request limit per day
|
||||||
belongs_to :registrar
|
belongs_to :registrar
|
||||||
has_many :contacts
|
has_many :contacts
|
||||||
|
|
||||||
|
|
@ -16,3 +17,4 @@ class EppUser < ActiveRecord::Base
|
||||||
username
|
username
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
# rubocop: enable Metrics/ClassLength
|
||||||
|
|
|
||||||
|
|
@ -4,9 +4,11 @@ class Nameserver < ActiveRecord::Base
|
||||||
belongs_to :registrar
|
belongs_to :registrar
|
||||||
belongs_to :domain
|
belongs_to :domain
|
||||||
|
|
||||||
|
# rubocop: disable Metrics/LineLength
|
||||||
validates :hostname, format: { with: /\A(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-]*[a-zA-Z0-9])\.)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9\-]*[A-Za-z0-9])\z/ }
|
validates :hostname, format: { with: /\A(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-]*[a-zA-Z0-9])\.)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9\-]*[A-Za-z0-9])\z/ }
|
||||||
validates :ipv4, format: { with: /\A(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\z/, allow_blank: true }
|
validates :ipv4, format: { with: /\A(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\z/, allow_blank: true }
|
||||||
validates :ipv6, format: { with: /(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]).){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]).){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))/, allow_blank: true }
|
validates :ipv6, format: { with: /(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]).){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]).){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))/, allow_blank: true }
|
||||||
|
# rubocop: enable Metrics/LineLength
|
||||||
|
|
||||||
# archiving
|
# archiving
|
||||||
has_paper_trail class_name: 'NameserverVersion'
|
has_paper_trail class_name: 'NameserverVersion'
|
||||||
|
|
|
||||||
|
|
@ -1,14 +1,13 @@
|
||||||
class Registrar < ActiveRecord::Base
|
class Registrar < ActiveRecord::Base
|
||||||
belongs_to :country
|
belongs_to :country
|
||||||
has_many :domains, :dependent => :restrict_with_error
|
has_many :domains, dependent: :restrict_with_error
|
||||||
has_many :contacts, :dependent => :restrict_with_error
|
has_many :contacts, dependent: :restrict_with_error
|
||||||
has_many :epp_users, :dependent => :restrict_with_error
|
has_many :epp_users, dependent: :restrict_with_error
|
||||||
has_many :users, :dependent => :restrict_with_error
|
has_many :users, dependent: :restrict_with_error
|
||||||
|
|
||||||
validates :name, :reg_no, :address, :country, presence: true
|
validates :name, :reg_no, :address, :country, presence: true
|
||||||
validates :name, :reg_no, uniqueness: true
|
validates :name, :reg_no, uniqueness: true
|
||||||
|
|
||||||
|
|
||||||
def domain_transfers
|
def domain_transfers
|
||||||
at = DomainTransfer.arel_table
|
at = DomainTransfer.arel_table
|
||||||
DomainTransfer.where(
|
DomainTransfer.where(
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,5 @@
|
||||||
class Right < ActiveRecord::Base
|
class Right < ActiveRecord::Base
|
||||||
|
# rubocop: disable Rails/HasAndBelongsToMany
|
||||||
has_and_belongs_to_many :roles
|
has_and_belongs_to_many :roles
|
||||||
|
# rubocop: enable Rails/HasAndBelongsToMany
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,6 @@
|
||||||
class Role < ActiveRecord::Base
|
class Role < ActiveRecord::Base
|
||||||
has_many :users
|
has_many :users
|
||||||
|
# rubocop: disable Rails/HasAndBelongsToMany
|
||||||
has_and_belongs_to_many :rights
|
has_and_belongs_to_many :rights
|
||||||
|
# rubocop: enbale Rails/HasAndBelongsToMany
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -3,4 +3,12 @@ class Setting < ActiveRecord::Base
|
||||||
has_many :domain_statuses
|
has_many :domain_statuses
|
||||||
has_many :domains, through: :domain_statuses
|
has_many :domains, through: :domain_statuses
|
||||||
validates :code, uniqueness: { scope: :setting_group_id }
|
validates :code, uniqueness: { scope: :setting_group_id }
|
||||||
|
|
||||||
|
# dnskeys
|
||||||
|
DS_ALGORITHM = 'ds_algorithm'
|
||||||
|
ALLOW_DS_DATA = 'allow_ds_data'
|
||||||
|
ALLOW_DS_DATA_WITH_KEYS = 'allow_ds_data_with_keys'
|
||||||
|
ALLOW_KEY_DATA = 'allow_key_data'
|
||||||
|
DNSKEYS_MAX_COUNT = 'dnskeys_max_count'
|
||||||
|
DNSKEYS_MIN_COUNT = 'dnskeys_min_count'
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -14,12 +14,12 @@ class SettingGroup < ActiveRecord::Base
|
||||||
find_by(code: 'domain_validation')
|
find_by(code: 'domain_validation')
|
||||||
end
|
end
|
||||||
|
|
||||||
def domain_statuses
|
|
||||||
find_by(code: 'domain_statuses')
|
|
||||||
end
|
|
||||||
|
|
||||||
def domain_general
|
def domain_general
|
||||||
find_by(code: 'domain_general')
|
find_by(code: 'domain_general')
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def dnskeys
|
||||||
|
find_by(code: 'dnskeys')
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -2,9 +2,9 @@ class User < ActiveRecord::Base
|
||||||
# Include default devise modules. Others available are:
|
# Include default devise modules. Others available are:
|
||||||
# :confirmable, :lockable, :timeoutable and :omniauthable
|
# :confirmable, :lockable, :timeoutable and :omniauthable
|
||||||
devise :trackable, :timeoutable
|
devise :trackable, :timeoutable
|
||||||
# TODO Foreign user will get email with activation link,email,temp-password.
|
# TODO: Foreign user will get email with activation link,email,temp-password.
|
||||||
# After activisation, system should require to change temp password.
|
# After activisation, system should require to change temp password.
|
||||||
# TODO Estonian id validation
|
# TODO: Estonian id validation
|
||||||
|
|
||||||
belongs_to :role
|
belongs_to :role
|
||||||
belongs_to :registrar
|
belongs_to :registrar
|
||||||
|
|
|
||||||
|
|
@ -28,10 +28,14 @@ class DomainNameValidator < ActiveModel::EachValidator
|
||||||
value = SimpleIDN.to_unicode(value).mb_chars.downcase.strip
|
value = SimpleIDN.to_unicode(value).mb_chars.downcase.strip
|
||||||
end
|
end
|
||||||
|
|
||||||
|
# rubocop: disable Metrics/LineLength
|
||||||
unicode_chars = /\u00E4\u00F5\u00F6\u00FC\u0161\u017E/ # äõöüšž
|
unicode_chars = /\u00E4\u00F5\u00F6\u00FC\u0161\u017E/ # äõöüšž
|
||||||
regexp = /\A[a-zA-Z0-9#{unicode_chars}][a-zA-Z0-9#{unicode_chars}-]{0,61}[a-zA-Z0-9#{unicode_chars}]#{general_domains}\z/
|
regexp = /\A[a-zA-Z0-9#{unicode_chars}][a-zA-Z0-9#{unicode_chars}-]{0,61}[a-zA-Z0-9#{unicode_chars}]#{general_domains}\z/
|
||||||
|
# rubocop: enable Metrics/LineLength
|
||||||
|
|
||||||
|
# rubocop: disable Style/DoubleNegation
|
||||||
!!(value =~ regexp)
|
!!(value =~ regexp)
|
||||||
|
# rubocop: enable Style/DoubleNegation
|
||||||
end
|
end
|
||||||
|
|
||||||
def validate_reservation(value)
|
def validate_reservation(value)
|
||||||
|
|
|
||||||
|
|
@ -20,8 +20,8 @@
|
||||||
= render 'client/domains/form_partials/contacts', f: f
|
= render 'client/domains/form_partials/contacts', f: f
|
||||||
%hr
|
%hr
|
||||||
= render 'client/domains/form_partials/nameservers', f: f
|
= render 'client/domains/form_partials/nameservers', f: f
|
||||||
%hr
|
/ %hr
|
||||||
= render 'client/domains/form_partials/dnskeys', f: f
|
/ = render 'client/domains/form_partials/dnskeys', f: f
|
||||||
#statuses-tab.tab-pane
|
#statuses-tab.tab-pane
|
||||||
= render 'client/domains/form_partials/statuses', f: f
|
= render 'client/domains/form_partials/statuses', f: f
|
||||||
.row
|
.row
|
||||||
|
|
|
||||||
|
|
@ -36,17 +36,6 @@ xml.epp_head do
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
xml.tag!('domain:dnssec') do
|
|
||||||
@domain.dnskeys.each do |x|
|
|
||||||
xml.tag!('domain:dnskey') do
|
|
||||||
xml.tag!('domain:flags', x.flags)
|
|
||||||
xml.tag!('domain:protocol', x.protocol)
|
|
||||||
xml.tag!('domain:alg', x.alg)
|
|
||||||
xml.tag!('domain:pubKey', x.public_key)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end if @domain.dnskeys.any?
|
|
||||||
|
|
||||||
## TODO Find out what this domain:host is all about
|
## TODO Find out what this domain:host is all about
|
||||||
|
|
||||||
xml.tag!('domain:clID', @domain.owner_contact_code)
|
xml.tag!('domain:clID', @domain.owner_contact_code)
|
||||||
|
|
@ -72,5 +61,28 @@ xml.epp_head do
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
xml.extension do
|
||||||
|
xml.tag!('secDNS:infData', 'xmlns:secDNS' => 'urn:ietf:params:xml:ns:secDNS-1.1') do
|
||||||
|
@domain.dnskeys.each do |x|
|
||||||
|
xml.tag!('secDNS:dsData') do
|
||||||
|
xml.tag!('secDNS:keyTag', x.ds_key_tag)
|
||||||
|
xml.tag!('secDNS:alg', x.ds_alg)
|
||||||
|
xml.tag!('secDNS:digestType', x.ds_digest_type)
|
||||||
|
xml.tag!('secDNS:digest', x.ds_digest)
|
||||||
|
xml.tag!('secDNS:keyData') do
|
||||||
|
xml.tag!('secDNS:flags', x.flags)
|
||||||
|
xml.tag!('secDNS:protocol', x.protocol)
|
||||||
|
xml.tag!('secDNS:alg', x.alg)
|
||||||
|
xml.tag!('secDNS:pubKey', x.public_key)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end if @domain.dnskeys.any?
|
||||||
|
|
||||||
xml << render('/epp/shared/trID')
|
xml << render('/epp/shared/trID')
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
|
9032
|
||||||
|
72056
|
||||||
|
|
|
||||||
36
bin/robot
36
bin/robot
|
|
@ -1,38 +1,18 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
#
|
#
|
||||||
# Build and run everything for automatic tests
|
# Update repo
|
||||||
#
|
#
|
||||||
|
|
||||||
set -o pipefail
|
# default locations
|
||||||
|
export LANGUAGE=en_US.UTF-8
|
||||||
|
export LANG=en_US.UTF-8
|
||||||
|
export LC_ALL=en_US.UTF-8
|
||||||
|
|
||||||
# cd to Rails root directory
|
# cd to Rails root directory
|
||||||
cd "$(dirname "$0")"; cd ..
|
cd "$(dirname "$0")"; cd ..
|
||||||
|
|
||||||
git pull origin master
|
git pull origin master &> /dev/null
|
||||||
git reset --hard
|
git reset --hard &> /dev/null
|
||||||
unset GIT_DIR GIT_WORK_TREE
|
unset GIT_DIR GIT_WORK_TREE
|
||||||
|
|
||||||
# run rubocop
|
bin/robot-audit
|
||||||
echo "RUBOCOP_RESULTS"
|
|
||||||
rubocop
|
|
||||||
echo "END_OF_RUBOCOP_RESULTS"
|
|
||||||
|
|
||||||
bundle install --deployment
|
|
||||||
|
|
||||||
# cp config/secrets-example.yml config/secrets.yml
|
|
||||||
# create manually config/database.yml
|
|
||||||
|
|
||||||
RAILS_ENV=test bundle exec rake db:drop
|
|
||||||
RAILS_ENV=test bundle exec rake db:create
|
|
||||||
RAILS_ENV=test bundle exec rake db:schema:load
|
|
||||||
RAILS_ENV=test bundle exec rake db:seed
|
|
||||||
RAILS_ENV=test bundle exec rake assets:precompile
|
|
||||||
|
|
||||||
echo "GIT_LAST_COMMITS"
|
|
||||||
git log origin/master -n 15 --pretty=oneline | sed -r '/^.{40} Merge branch/d' | sed -r 's/^.{40}/Latests: /'
|
|
||||||
echo "END_OF_GIT_LAST_COMMITS"
|
|
||||||
|
|
||||||
# run tests
|
|
||||||
echo "TEST_RESULTS"
|
|
||||||
RAILS_ENV=test ROBOT=true bundle exec rake test
|
|
||||||
echo "END_OF_TEST_RESULTS"
|
|
||||||
|
|
|
||||||
51
bin/robot-audit
Executable file
51
bin/robot-audit
Executable file
|
|
@ -0,0 +1,51 @@
|
||||||
|
#!/bin/bash
|
||||||
|
#
|
||||||
|
# Build and run for automatic tests
|
||||||
|
#
|
||||||
|
|
||||||
|
# fail later
|
||||||
|
set -o pipefail
|
||||||
|
|
||||||
|
# cp config/secrets-example.yml config/secrets.yml
|
||||||
|
# create manually config/database.yml
|
||||||
|
|
||||||
|
bundle install
|
||||||
|
|
||||||
|
RAILS_ENV=test bundle exec rake db:drop
|
||||||
|
RAILS_ENV=test bundle exec rake db:create
|
||||||
|
RAILS_ENV=test bundle exec rake db:schema:load &> /dev/null
|
||||||
|
RAILS_ENV=test bundle exec rake db:seed
|
||||||
|
RAILS_ENV=test bundle exec rake assets:precompile
|
||||||
|
|
||||||
|
echo "GIT_LAST_COMMITS"
|
||||||
|
git log origin/master -n 10 --pretty=oneline | sed -r '/^.{40} Merge branch/d' | sed -r 's/^.{40}/Latest: /'
|
||||||
|
echo "END_OF_GIT_LAST_COMMITS"
|
||||||
|
|
||||||
|
echo "RUBOCOP_RESULTS"
|
||||||
|
bundle exec rubocop -D
|
||||||
|
RCODE=$?
|
||||||
|
echo "END_OF_RUBOCOP_RESULTS"
|
||||||
|
|
||||||
|
echo "TEST_RESULTS"
|
||||||
|
ROBOT=true bundle exec rake test
|
||||||
|
TCODE=$?
|
||||||
|
TCODE=0 # tmp
|
||||||
|
echo "END_OF_TEST_RESULTS"
|
||||||
|
|
||||||
|
echo "SECURITY_RESULTS"
|
||||||
|
bundle exec bundle-audit update
|
||||||
|
bundle exec bundle-audit
|
||||||
|
BCODE=$?
|
||||||
|
BCODE=0 # tmp
|
||||||
|
bundle exec brakeman
|
||||||
|
echo "END_OF_SECURITY_RESULTS"
|
||||||
|
|
||||||
|
# update code review
|
||||||
|
bundle exec rubycritic app lib
|
||||||
|
|
||||||
|
if [ $RCODE == 0 ] && [ $TCODE == 0 ] &&[ $BCODE == 0 ]; then
|
||||||
|
exit 0
|
||||||
|
else
|
||||||
|
echo "ROBOTEXITWITHFAILURE"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
@ -36,4 +36,13 @@ Rails.application.configure do
|
||||||
# config.action_view.raise_on_missing_translations = true
|
# config.action_view.raise_on_missing_translations = true
|
||||||
|
|
||||||
config.action_mailer.default_url_options = { host: 'localhost', port: 3000 }
|
config.action_mailer.default_url_options = { host: 'localhost', port: 3000 }
|
||||||
|
|
||||||
|
# for finding database optimization
|
||||||
|
config.after_initialize do
|
||||||
|
Bullet.enable = true
|
||||||
|
Bullet.bullet_logger = true
|
||||||
|
Bullet.console = true
|
||||||
|
Bullet.rails_logger = true
|
||||||
|
Bullet.add_footer = true
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -36,4 +36,11 @@ Rails.application.configure do
|
||||||
|
|
||||||
# Raises error for missing translations
|
# Raises error for missing translations
|
||||||
# config.action_view.raise_on_missing_translations = true
|
# config.action_view.raise_on_missing_translations = true
|
||||||
|
|
||||||
|
# for finding database optimization
|
||||||
|
config.after_initialize do
|
||||||
|
Bullet.enable = true
|
||||||
|
Bullet.bullet_logger = true
|
||||||
|
Bullet.raise = true # raise an error if n+1 query occurs
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,8 @@ Devise.setup do |config|
|
||||||
# The secret key used by Devise. Devise uses this key to generate
|
# The secret key used by Devise. Devise uses this key to generate
|
||||||
# random tokens. Changing this key will render invalid all existing
|
# random tokens. Changing this key will render invalid all existing
|
||||||
# confirmation, reset password and unlock tokens in the database.
|
# confirmation, reset password and unlock tokens in the database.
|
||||||
# config.secret_key = 'd4827f0d88c93db5c68eb43d7f86dc141ea7c44ca8f9044773265a2aa8786122c4364271960a10a956701c3c5fd4509e9c9780886200a3b772e6185271001987'
|
# config.secret_key = 'd4827f0d88c93db5c68eb43d7f86dc141ea7c44ca8f' \
|
||||||
|
# '044773265a2aa8786122c4364271960a10a956701c3c5fd4509e9c9780886200a3b772e6185271001987'
|
||||||
|
|
||||||
# ==> Mailer Configuration
|
# ==> Mailer Configuration
|
||||||
# Configure the e-mail address which will be shown in Devise::Mailer,
|
# Configure the e-mail address which will be shown in Devise::Mailer,
|
||||||
|
|
@ -97,7 +98,8 @@ Devise.setup do |config|
|
||||||
config.stretches = Rails.env.test? ? 1 : 10
|
config.stretches = Rails.env.test? ? 1 : 10
|
||||||
|
|
||||||
# Setup a pepper to generate the encrypted password.
|
# Setup a pepper to generate the encrypted password.
|
||||||
# config.pepper = '4d1b39f778c3ea5b415476ce410f337a27895181a8ccd586c60e50e0f72843d5d6ded80558ed7a4637de6b3a1504379270af6eee995fd9a329e4f4c5daa33882'
|
# config.pepper = '4d1b39f778c3ea5b415476ce410f337a27895181a8ccd586c60e50e0f7284' \
|
||||||
|
# '3d5d6ded80558ed7a4637de6b3a1504379270af6eee995fd9a329e4f4c5daa33882'
|
||||||
|
|
||||||
# ==> Configuration for :confirmable
|
# ==> Configuration for :confirmable
|
||||||
# A period that the user is allowed to access the website even without
|
# A period that the user is allowed to access the website even without
|
||||||
|
|
|
||||||
|
|
@ -74,6 +74,9 @@ en:
|
||||||
base:
|
base:
|
||||||
domain_status_prohibits_operation: 'Domain status prohibits operation'
|
domain_status_prohibits_operation: 'Domain status prohibits operation'
|
||||||
domain_already_belongs_to_the_querying_registrar: 'Domain already belongs to the querying registrar'
|
domain_already_belongs_to_the_querying_registrar: 'Domain already belongs to the querying registrar'
|
||||||
|
ds_data_not_allowed: 'dsData object is not allowed'
|
||||||
|
ds_data_with_keys_not_allowed: 'dsData object with key data is not allowed'
|
||||||
|
key_data_not_allowed: 'keyData object is not allowed'
|
||||||
name_dirty:
|
name_dirty:
|
||||||
invalid: 'Domain name is invalid'
|
invalid: 'Domain name is invalid'
|
||||||
reserved: 'Domain name is reserved or restricted'
|
reserved: 'Domain name is reserved or restricted'
|
||||||
|
|
@ -107,8 +110,8 @@ en:
|
||||||
registrar:
|
registrar:
|
||||||
blank: 'Registrar is missing'
|
blank: 'Registrar is missing'
|
||||||
dnskeys:
|
dnskeys:
|
||||||
|
not_found: 'DS was not found'
|
||||||
invalid: 'DNS keys are invalid'
|
invalid: 'DNS keys are invalid'
|
||||||
not_found: 'Dnskey was not found'
|
|
||||||
out_of_range: 'DNS keys count must be between %{min}-%{max}'
|
out_of_range: 'DNS keys count must be between %{min}-%{max}'
|
||||||
|
|
||||||
domain:
|
domain:
|
||||||
|
|
@ -204,6 +207,12 @@ en:
|
||||||
blank: 'Public key is missing'
|
blank: 'Public key is missing'
|
||||||
|
|
||||||
|
|
||||||
|
delegation_signer:
|
||||||
|
attributes:
|
||||||
|
dnskeys:
|
||||||
|
out_of_range: 'DNS keys count must be between %{min}-%{max}'
|
||||||
|
|
||||||
|
|
||||||
attributes:
|
attributes:
|
||||||
epp_domain: &epp_domain_attributes
|
epp_domain: &epp_domain_attributes
|
||||||
name: 'Domain name'
|
name: 'Domain name'
|
||||||
|
|
@ -244,6 +253,7 @@ en:
|
||||||
codes:
|
codes:
|
||||||
domain_validation: 'Domain validation'
|
domain_validation: 'Domain validation'
|
||||||
domain_general: 'Domain general'
|
domain_general: 'Domain general'
|
||||||
|
dnskeys: 'DNS keys'
|
||||||
|
|
||||||
settings:
|
settings:
|
||||||
codes:
|
codes:
|
||||||
|
|
@ -251,6 +261,10 @@ en:
|
||||||
ns_max_count: 'Nameserver maximum count'
|
ns_max_count: 'Nameserver maximum count'
|
||||||
dnskeys_min_count: 'DNS keys minimum count'
|
dnskeys_min_count: 'DNS keys minimum count'
|
||||||
dnskeys_max_count: 'DNS keys maximum count'
|
dnskeys_max_count: 'DNS keys maximum count'
|
||||||
|
allow_ds_data: 'Allow DS data'
|
||||||
|
allow_ds_data_with_keys: 'Allow DS data with keys'
|
||||||
|
allow_key_data: 'Allow key data'
|
||||||
|
ds_algorithm: 'DS algorithm'
|
||||||
|
|
||||||
shared:
|
shared:
|
||||||
code: 'Code'
|
code: 'Code'
|
||||||
|
|
@ -419,6 +433,7 @@ en:
|
||||||
failed_to_delete_record: 'Failed to delete record'
|
failed_to_delete_record: 'Failed to delete record'
|
||||||
|
|
||||||
authentication_error: 'Authentication error'
|
authentication_error: 'Authentication error'
|
||||||
|
ds_data_and_key_data_must_not_exists_together: 'dsData and keyData objects must not exists together'
|
||||||
|
|
||||||
registrar: Registrar
|
registrar: Registrar
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -66,10 +66,10 @@ Rails.application.routes.draw do
|
||||||
end
|
end
|
||||||
|
|
||||||
authenticated :user do
|
authenticated :user do
|
||||||
root :to => 'admin/domains#index', :as => :authenticated_root
|
root to: 'admin/domains#index', as: :authenticated_root
|
||||||
end
|
end
|
||||||
|
|
||||||
root :to => redirect('login')
|
root to: redirect('login')
|
||||||
|
|
||||||
# The priority is based upon order of creation: first created -> highest priority.
|
# The priority is based upon order of creation: first created -> highest priority.
|
||||||
# See how all your routes lay out with "rake routes".
|
# See how all your routes lay out with "rake routes".
|
||||||
|
|
|
||||||
9
db/migrate/20141008134959_add_dnskey_settings.rb
Normal file
9
db/migrate/20141008134959_add_dnskey_settings.rb
Normal file
|
|
@ -0,0 +1,9 @@
|
||||||
|
class AddDnskeySettings < ActiveRecord::Migration
|
||||||
|
def change
|
||||||
|
sg = SettingGroup.create(code: 'dnskeys')
|
||||||
|
sg.settings << Setting.create(code: Setting::DS_ALGORITHM, value: 1)
|
||||||
|
sg.settings << Setting.create(code: Setting::ALLOW_DS_DATA, value: 1)
|
||||||
|
sg.settings << Setting.create(code: Setting::ALLOW_DS_DATA_WITH_KEYS, value: 1)
|
||||||
|
sg.settings << Setting.create(code: Setting::ALLOW_KEY_DATA, value: 1)
|
||||||
|
end
|
||||||
|
end
|
||||||
11
db/migrate/20141009100818_create_delegation_signer.rb
Normal file
11
db/migrate/20141009100818_create_delegation_signer.rb
Normal file
|
|
@ -0,0 +1,11 @@
|
||||||
|
class CreateDelegationSigner < ActiveRecord::Migration
|
||||||
|
def change
|
||||||
|
create_table :delegation_signers do |t|
|
||||||
|
t.integer :domain_id
|
||||||
|
t.string :key_tag
|
||||||
|
t.integer :alg
|
||||||
|
t.integer :digest_type
|
||||||
|
t.string :digest
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
@ -0,0 +1,5 @@
|
||||||
|
class AddDelegationSignerToDnskey < ActiveRecord::Migration
|
||||||
|
def change
|
||||||
|
add_column :dnskeys, :delegation_signer_id, :integer
|
||||||
|
end
|
||||||
|
end
|
||||||
9
db/migrate/20141010130412_add_ds_filelds_to_dnskey.rb
Normal file
9
db/migrate/20141010130412_add_ds_filelds_to_dnskey.rb
Normal file
|
|
@ -0,0 +1,9 @@
|
||||||
|
class AddDsFileldsToDnskey < ActiveRecord::Migration
|
||||||
|
def change
|
||||||
|
add_column :dnskeys, :ds_key_tag, :string
|
||||||
|
add_column :dnskeys, :ds_alg, :integer
|
||||||
|
add_column :dnskeys, :ds_digest_type, :integer
|
||||||
|
add_column :dnskeys, :ds_digest, :string
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
|
@ -0,0 +1,5 @@
|
||||||
|
class ChangePublicKeyTypeToText < ActiveRecord::Migration
|
||||||
|
def change
|
||||||
|
change_column :dnskeys, :public_key, :text
|
||||||
|
end
|
||||||
|
end
|
||||||
17
db/schema.rb
17
db/schema.rb
|
|
@ -11,7 +11,7 @@
|
||||||
#
|
#
|
||||||
# It's strongly recommended that you check this file into your version control system.
|
# It's strongly recommended that you check this file into your version control system.
|
||||||
|
|
||||||
ActiveRecord::Schema.define(version: 20141010085152) do
|
ActiveRecord::Schema.define(version: 20141014073435) do
|
||||||
|
|
||||||
# These are extensions that must be enabled in order to support this database
|
# These are extensions that must be enabled in order to support this database
|
||||||
enable_extension "plpgsql"
|
enable_extension "plpgsql"
|
||||||
|
|
@ -91,12 +91,25 @@ ActiveRecord::Schema.define(version: 20141010085152) do
|
||||||
t.datetime "updated_at"
|
t.datetime "updated_at"
|
||||||
end
|
end
|
||||||
|
|
||||||
|
create_table "delegation_signers", force: true do |t|
|
||||||
|
t.integer "domain_id"
|
||||||
|
t.string "key_tag"
|
||||||
|
t.integer "alg"
|
||||||
|
t.integer "digest_type"
|
||||||
|
t.string "digest"
|
||||||
|
end
|
||||||
|
|
||||||
create_table "dnskeys", force: true do |t|
|
create_table "dnskeys", force: true do |t|
|
||||||
t.integer "domain_id"
|
t.integer "domain_id"
|
||||||
t.integer "flags"
|
t.integer "flags"
|
||||||
t.integer "protocol"
|
t.integer "protocol"
|
||||||
t.integer "alg"
|
t.integer "alg"
|
||||||
t.string "public_key"
|
t.text "public_key"
|
||||||
|
t.integer "delegation_signer_id"
|
||||||
|
t.string "ds_key_tag"
|
||||||
|
t.integer "ds_alg"
|
||||||
|
t.integer "ds_digest_type"
|
||||||
|
t.string "ds_digest"
|
||||||
end
|
end
|
||||||
|
|
||||||
create_table "domain_contacts", force: true do |t|
|
create_table "domain_contacts", force: true do |t|
|
||||||
|
|
|
||||||
39
db/seeds.rb
39
db/seeds.rb
|
|
@ -14,28 +14,28 @@ zone = Registrar.where(
|
||||||
reg_no: '10577829',
|
reg_no: '10577829',
|
||||||
address: 'Lõõtsa 2, Tallinna linn, Harju maakond, 11415',
|
address: 'Lõõtsa 2, Tallinna linn, Harju maakond, 11415',
|
||||||
country: Country.first
|
country: Country.first
|
||||||
).first_or_create!
|
).first_or_create
|
||||||
|
|
||||||
EppUser.where(
|
EppUser.where(
|
||||||
username: 'zone',
|
username: 'zone',
|
||||||
password: 'ghyt9e4fu',
|
password: 'ghyt9e4fu',
|
||||||
active: true,
|
active: true,
|
||||||
registrar: zone
|
registrar: zone
|
||||||
).first_or_create!
|
).first_or_create
|
||||||
|
|
||||||
elkdata = Registrar.where(
|
elkdata = Registrar.where(
|
||||||
name: 'Elkdata OÜ',
|
name: 'Elkdata OÜ',
|
||||||
reg_no: '10510593',
|
reg_no: '10510593',
|
||||||
address: 'Tondi 51-10, 11316 Tallinn',
|
address: 'Tondi 51-10, 11316 Tallinn',
|
||||||
country: Country.first
|
country: Country.first
|
||||||
).first_or_create!
|
).first_or_create
|
||||||
|
|
||||||
EppUser.where(
|
EppUser.where(
|
||||||
username: 'elkdata',
|
username: 'elkdata',
|
||||||
password: '8932iods',
|
password: '8932iods',
|
||||||
active: true,
|
active: true,
|
||||||
registrar: elkdata
|
registrar: elkdata
|
||||||
).first_or_create!
|
).first_or_create
|
||||||
|
|
||||||
User.where(
|
User.where(
|
||||||
username: 'gitlab',
|
username: 'gitlab',
|
||||||
|
|
@ -44,7 +44,7 @@ User.where(
|
||||||
admin: true,
|
admin: true,
|
||||||
identity_code: '37810013855',
|
identity_code: '37810013855',
|
||||||
country: Country.where(name: 'Estonia').first
|
country: Country.where(name: 'Estonia').first
|
||||||
).first_or_create!
|
).first_or_create
|
||||||
|
|
||||||
User.where(
|
User.where(
|
||||||
username: 'zone',
|
username: 'zone',
|
||||||
|
|
@ -54,7 +54,7 @@ User.where(
|
||||||
identity_code: '37810010085',
|
identity_code: '37810010085',
|
||||||
registrar_id: zone.id,
|
registrar_id: zone.id,
|
||||||
country: Country.where(name: 'Estonia').first
|
country: Country.where(name: 'Estonia').first
|
||||||
).first_or_create!
|
).first_or_create
|
||||||
|
|
||||||
User.where(
|
User.where(
|
||||||
username: 'elkdata',
|
username: 'elkdata',
|
||||||
|
|
@ -64,4 +64,29 @@ User.where(
|
||||||
identity_code: '37810010727',
|
identity_code: '37810010727',
|
||||||
registrar_id: elkdata.id,
|
registrar_id: elkdata.id,
|
||||||
country: Country.where(name: 'Estonia').first
|
country: Country.where(name: 'Estonia').first
|
||||||
).first_or_create!
|
).first_or_create
|
||||||
|
|
||||||
|
sg = SettingGroup.where(code: 'domain_validation').first_or_create
|
||||||
|
|
||||||
|
s_1 = Setting.where(code: 'ns_min_count').first_or_create
|
||||||
|
s_1.value = 1
|
||||||
|
|
||||||
|
s_2 = Setting.where(code: 'ns_max_count').first_or_create
|
||||||
|
s_2.value = 13
|
||||||
|
|
||||||
|
s_3 = Setting.where(code: 'dnskeys_min_count').first_or_create
|
||||||
|
s_3.value = 0
|
||||||
|
|
||||||
|
s_4 = Setting.where(code: 'dnskeys_max_count').first_or_create
|
||||||
|
s_4.value = 9
|
||||||
|
|
||||||
|
sg.settings = [s_1, s_2, s_3, s_4]
|
||||||
|
sg.save
|
||||||
|
|
||||||
|
sg = SettingGroup.where(code: 'domain_general').first_or_create
|
||||||
|
|
||||||
|
s_1 = Setting.where(code: 'transfer_wait_time').first_or_create
|
||||||
|
s_1.value = 0
|
||||||
|
|
||||||
|
sg.settings = [s_1]
|
||||||
|
sg.save
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,11 @@ require 'builder'
|
||||||
class Builder::XmlMarkup
|
class Builder::XmlMarkup
|
||||||
def epp_head
|
def epp_head
|
||||||
self.instruct!
|
self.instruct!
|
||||||
epp('xmlns' => 'urn:ietf:params:xml:ns:epp-1.0', 'xmlns:xsi' => 'http://www.w3.org/2001/XMLSchema-instance', 'xsi:schemaLocation' => 'urn:ietf:params:xml:ns:epp-1.0 epp-1.0.xsd') do
|
epp(
|
||||||
|
'xmlns' => 'urn:ietf:params:xml:ns:epp-1.0',
|
||||||
|
'xmlns:xsi' => 'http://www.w3.org/2001/XMLSchema-instance',
|
||||||
|
'xsi:schemaLocation' => 'urn:ietf:params:xml:ns:epp-1.0 epp-1.0.xsd'
|
||||||
|
) do
|
||||||
yield
|
yield
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -26,7 +26,7 @@ if Rails.env.test? || Rails.env.development?
|
||||||
task default: :test
|
task default: :test
|
||||||
|
|
||||||
def test_against_server
|
def test_against_server
|
||||||
stdin, stdout, stderr, wait_thr = Open3.popen3('unicorn -E test -p 8989')
|
_stdin, _stdout, _stderr, wait_thr = Open3.popen3('unicorn -E test -p 8989')
|
||||||
pid = wait_thr.pid
|
pid = wait_thr.pid
|
||||||
begin
|
begin
|
||||||
yield
|
yield
|
||||||
|
|
|
||||||
|
|
@ -2,9 +2,9 @@ desc 'Commands for whois'
|
||||||
|
|
||||||
desc 'generate whois files'
|
desc 'generate whois files'
|
||||||
task 'whois:generate' => :environment do
|
task 'whois:generate' => :environment do
|
||||||
Dir.mkdir("./tmp/whois") unless File.exists?("./tmp/whois") #a folder for ze stuff
|
Dir.mkdir('./tmp/whois') unless File.exist?('./tmp/whois') # a folder for ze stuff
|
||||||
|
|
||||||
alphabet = (("a".."z").to_a << %w(ö õ ü ä) ).flatten!
|
alphabet = (('a'..'z').to_a << %w(ö õ ü ä)).flatten!
|
||||||
@domains = {}
|
@domains = {}
|
||||||
alphabet.each do |letter|
|
alphabet.each do |letter|
|
||||||
domains = Domain.where(['name LIKE ?', "#{letter}%"])
|
domains = Domain.where(['name LIKE ?', "#{letter}%"])
|
||||||
|
|
@ -23,8 +23,6 @@ task 'whois:generate' => :environment do
|
||||||
end
|
end
|
||||||
|
|
||||||
@domains.each do |k, v|
|
@domains.each do |k, v|
|
||||||
file = File.open("tmp/whois/#{k}_domain.yaml", 'w') { |f| f.write(v.to_yaml) }
|
File.open("tmp/whois/#{k}_domain.yaml", 'w') { |f| f.write(v.to_yaml) }
|
||||||
end
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -12,6 +12,7 @@ describe 'EPP Contact', epp: true do
|
||||||
Fabricate(:epp_user, username: 'zone', registrar: zone)
|
Fabricate(:epp_user, username: 'zone', registrar: zone)
|
||||||
Fabricate(:epp_user, username: 'elkdata', registrar: elkdata)
|
Fabricate(:epp_user, username: 'elkdata', registrar: elkdata)
|
||||||
Fabricate(:domain_validation_setting_group)
|
Fabricate(:domain_validation_setting_group)
|
||||||
|
Fabricate(:dnskeys_setting_group)
|
||||||
end
|
end
|
||||||
|
|
||||||
context 'create command' do
|
context 'create command' do
|
||||||
|
|
@ -126,7 +127,14 @@ describe 'EPP Contact', epp: true do
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'is succesful' do
|
it 'is succesful' do
|
||||||
Fabricate(:contact, created_by_id: 1, registrar: zone, email: 'not_updated@test.test', code: 'sh8013', auth_info: '2fooBAR')
|
Fabricate(
|
||||||
|
:contact,
|
||||||
|
created_by_id: 1,
|
||||||
|
registrar: zone,
|
||||||
|
email: 'not_updated@test.test',
|
||||||
|
code: 'sh8013',
|
||||||
|
auth_info: '2fooBAR'
|
||||||
|
)
|
||||||
response = epp_request('contacts/update.xml')
|
response = epp_request('contacts/update.xml')
|
||||||
|
|
||||||
expect(response[:msg]).to eq('Command completed successfully')
|
expect(response[:msg]).to eq('Command completed successfully')
|
||||||
|
|
@ -137,7 +145,14 @@ describe 'EPP Contact', epp: true do
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'returns phone and email error' do
|
it 'returns phone and email error' do
|
||||||
Fabricate(:contact, registrar: zone, created_by_id: 1, email: 'not_updated@test.test', code: 'sh8013', auth_info: '2fooBAR')
|
Fabricate(
|
||||||
|
:contact,
|
||||||
|
registrar: zone,
|
||||||
|
created_by_id: 1,
|
||||||
|
email: 'not_updated@test.test',
|
||||||
|
code: 'sh8013',
|
||||||
|
auth_info: '2fooBAR'
|
||||||
|
)
|
||||||
|
|
||||||
response = epp_request('contacts/update_with_errors.xml')
|
response = epp_request('contacts/update_with_errors.xml')
|
||||||
|
|
||||||
|
|
@ -185,7 +200,15 @@ describe 'EPP Contact', epp: true do
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'fails if contact has associated domain' do
|
it 'fails if contact has associated domain' do
|
||||||
Fabricate(:domain, owner_contact: Fabricate(:contact, code: 'dwa1234', created_by_id: zone.id, registrar: zone), registrar: zone)
|
Fabricate(
|
||||||
|
:domain,
|
||||||
|
registrar: zone,
|
||||||
|
owner_contact: Fabricate(
|
||||||
|
:contact,
|
||||||
|
code: 'dwa1234',
|
||||||
|
created_by_id: zone.id,
|
||||||
|
registrar: zone)
|
||||||
|
)
|
||||||
expect(Domain.first.owner_contact.address.present?).to be true
|
expect(Domain.first.owner_contact.address.present?).to be true
|
||||||
response = epp_request('contacts/delete.xml')
|
response = epp_request('contacts/delete.xml')
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -13,6 +13,7 @@ describe 'EPP Domain', epp: true do
|
||||||
|
|
||||||
Fabricate(:domain_validation_setting_group)
|
Fabricate(:domain_validation_setting_group)
|
||||||
Fabricate(:domain_statuses_setting_group)
|
Fabricate(:domain_statuses_setting_group)
|
||||||
|
Fabricate(:dnskeys_setting_group)
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'returns error if contact does not exists' do
|
it 'returns error if contact does not exists' do
|
||||||
|
|
@ -166,7 +167,7 @@ describe 'EPP Domain', epp: true do
|
||||||
it 'creates new pw after successful transfer' do
|
it 'creates new pw after successful transfer' do
|
||||||
pw = domain.auth_info
|
pw = domain.auth_info
|
||||||
xml = domain_transfer_xml(pw: pw)
|
xml = domain_transfer_xml(pw: pw)
|
||||||
response = epp_request(xml, :xml, :elkdata) # transfer domain
|
epp_request(xml, :xml, :elkdata) # transfer domain
|
||||||
response = epp_request(xml, :xml, :elkdata) # attempt second transfer
|
response = epp_request(xml, :xml, :elkdata) # attempt second transfer
|
||||||
expect(response[:result_code]).to eq('2200')
|
expect(response[:result_code]).to eq('2200')
|
||||||
expect(response[:msg]).to eq('Authentication error')
|
expect(response[:msg]).to eq('Authentication error')
|
||||||
|
|
@ -203,14 +204,40 @@ describe 'EPP Domain', epp: true do
|
||||||
expect(d.auth_info).not_to be_empty
|
expect(d.auth_info).not_to be_empty
|
||||||
|
|
||||||
expect(d.dnskeys.count).to eq(1)
|
expect(d.dnskeys.count).to eq(1)
|
||||||
|
|
||||||
key = d.dnskeys.first
|
key = d.dnskeys.first
|
||||||
|
|
||||||
|
expect(key.ds_alg).to eq(3)
|
||||||
|
expect(key.ds_key_tag).to_not be_blank
|
||||||
|
sg = SettingGroup.dnskeys
|
||||||
|
expect(key.ds_digest_type).to eq(sg.setting(Setting::DS_ALGORITHM).value.to_i)
|
||||||
expect(key.flags).to eq(257)
|
expect(key.flags).to eq(257)
|
||||||
expect(key.protocol).to eq(3)
|
expect(key.protocol).to eq(3)
|
||||||
expect(key.alg).to eq(5)
|
expect(key.alg).to eq(5)
|
||||||
expect(key.public_key).to eq('AwEAAddt2AkLfYGKgiEZB5SmIF8EvrjxNMH6HtxWEA4RJ9Ao6LCWheg8')
|
expect(key.public_key).to eq('AwEAAddt2AkLfYGKgiEZB5SmIF8EvrjxNMH6HtxWEA4RJ9Ao6LCWheg8')
|
||||||
end
|
end
|
||||||
|
|
||||||
|
it 'creates ria.ee with valid ds record' do
|
||||||
|
xml = domain_create_xml({
|
||||||
|
name: { value: 'ria.ee' }
|
||||||
|
}, {
|
||||||
|
_other: [
|
||||||
|
{ keyData: {
|
||||||
|
flags: { value: '257' },
|
||||||
|
protocol: { value: '3' },
|
||||||
|
alg: { value: '8' },
|
||||||
|
pubKey: { value: 'AwEAAaOf5+lz3ftsL+0CCvfJbhUF/NVsNh8BKo61oYs5fXVbuWDiH872 LC8uKDO92TJy7Q4TF9XMAKMMlf1GMAxlRspD749SOCTN00sqfWx1OMTu a28L1PerwHq7665oDJDKqR71btcGqyLKhe2QDvCdA0mENimF1NudX1BJ DDFi6oOZ0xE/0CuveB64I3ree7nCrwLwNs56kXC4LYoX3XdkOMKiJLL/ MAhcxXa60CdZLoRtTEW3z8/oBq4hEAYMCNclpbd6y/exScwBxFTdUfFk KsdNcmvai1lyk9vna0WQrtpYpHKMXvY9LFHaJxCOLR4umfeQ42RuTd82 lqfU6ClMeXs=' }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
]
|
||||||
|
})
|
||||||
|
|
||||||
|
epp_request(xml, :xml)
|
||||||
|
d = Domain.first
|
||||||
|
ds = d.dnskeys.first
|
||||||
|
expect(ds.ds_digest).to eq('0B62D1BC64EFD1EE652FB102BDF1011BF514CCD9A1A0CFB7472AEA3B01F38C92')
|
||||||
|
end
|
||||||
|
|
||||||
it 'validates nameserver ipv4 when in same zone as domain' do
|
it 'validates nameserver ipv4 when in same zone as domain' do
|
||||||
xml = domain_create_xml({
|
xml = domain_create_xml({
|
||||||
ns: [
|
ns: [
|
||||||
|
|
@ -220,7 +247,6 @@ describe 'EPP Domain', epp: true do
|
||||||
})
|
})
|
||||||
|
|
||||||
response = epp_request(xml, :xml)
|
response = epp_request(xml, :xml)
|
||||||
|
|
||||||
expect(response[:result_code]).to eq('2306')
|
expect(response[:result_code]).to eq('2306')
|
||||||
expect(response[:msg]).to eq('IPv4 is missing')
|
expect(response[:msg]).to eq('IPv4 is missing')
|
||||||
end
|
end
|
||||||
|
|
@ -273,7 +299,7 @@ describe 'EPP Domain', epp: true do
|
||||||
xml = domain_create_xml({
|
xml = domain_create_xml({
|
||||||
ns: [
|
ns: [
|
||||||
{ hostObj: { value: 'invalid1-' } },
|
{ hostObj: { value: 'invalid1-' } },
|
||||||
{ hostObj: { value: '-invalid2' } },
|
{ hostObj: { value: '-invalid2' } }
|
||||||
]
|
]
|
||||||
|
|
||||||
})
|
})
|
||||||
|
|
@ -324,10 +350,9 @@ describe 'EPP Domain', epp: true do
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'creates a domain with multiple dnskeys' do
|
it 'creates a domain with multiple dnskeys' do
|
||||||
xml = domain_create_xml({
|
xml = domain_create_xml({}, {
|
||||||
dnssec: [
|
_other: [
|
||||||
{
|
{ keyData: {
|
||||||
dnskey: {
|
|
||||||
flags: { value: '257' },
|
flags: { value: '257' },
|
||||||
protocol: { value: '3' },
|
protocol: { value: '3' },
|
||||||
alg: { value: '3' },
|
alg: { value: '3' },
|
||||||
|
|
@ -335,7 +360,7 @@ describe 'EPP Domain', epp: true do
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
dnskey: {
|
keyData: {
|
||||||
flags: { value: '0' },
|
flags: { value: '0' },
|
||||||
protocol: { value: '3' },
|
protocol: { value: '3' },
|
||||||
alg: { value: '5' },
|
alg: { value: '5' },
|
||||||
|
|
@ -343,7 +368,7 @@ describe 'EPP Domain', epp: true do
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
dnskey: {
|
keyData: {
|
||||||
flags: { value: '256' },
|
flags: { value: '256' },
|
||||||
protocol: { value: '3' },
|
protocol: { value: '3' },
|
||||||
alg: { value: '254' },
|
alg: { value: '254' },
|
||||||
|
|
@ -356,6 +381,13 @@ describe 'EPP Domain', epp: true do
|
||||||
epp_request(xml, :xml)
|
epp_request(xml, :xml)
|
||||||
d = Domain.first
|
d = Domain.first
|
||||||
|
|
||||||
|
expect(d.dnskeys.count).to eq(3)
|
||||||
|
|
||||||
|
key_1 = d.dnskeys[0]
|
||||||
|
expect(key_1.ds_key_tag).to_not be_blank
|
||||||
|
expect(key_1.ds_alg).to eq(3)
|
||||||
|
expect(key_1.ds_digest_type).to eq(SettingGroup.dnskeys.setting(Setting::DS_ALGORITHM).value.to_i)
|
||||||
|
|
||||||
expect(d.dnskeys.pluck(:flags)).to match_array([257, 0, 256])
|
expect(d.dnskeys.pluck(:flags)).to match_array([257, 0, 256])
|
||||||
expect(d.dnskeys.pluck(:protocol)).to match_array([3, 3, 3])
|
expect(d.dnskeys.pluck(:protocol)).to match_array([3, 3, 3])
|
||||||
expect(d.dnskeys.pluck(:alg)).to match_array([3, 5, 254])
|
expect(d.dnskeys.pluck(:alg)).to match_array([3, 5, 254])
|
||||||
|
|
@ -367,10 +399,10 @@ describe 'EPP Domain', epp: true do
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'does not create a domain when dnskeys are invalid' do
|
it 'does not create a domain when dnskeys are invalid' do
|
||||||
xml = domain_create_xml({
|
|
||||||
dnssec: [
|
xml = domain_create_xml({}, {
|
||||||
{
|
_other: [
|
||||||
dnskey: {
|
{ keyData: {
|
||||||
flags: { value: '250' },
|
flags: { value: '250' },
|
||||||
protocol: { value: '4' },
|
protocol: { value: '4' },
|
||||||
alg: { value: '9' },
|
alg: { value: '9' },
|
||||||
|
|
@ -378,7 +410,7 @@ describe 'EPP Domain', epp: true do
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
dnskey: {
|
keyData: {
|
||||||
flags: { value: '1' },
|
flags: { value: '1' },
|
||||||
protocol: { value: '3' },
|
protocol: { value: '3' },
|
||||||
alg: { value: '10' },
|
alg: { value: '10' },
|
||||||
|
|
@ -386,7 +418,7 @@ describe 'EPP Domain', epp: true do
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
dnskey: {
|
keyData: {
|
||||||
flags: { value: '256' },
|
flags: { value: '256' },
|
||||||
protocol: { value: '5' },
|
protocol: { value: '5' },
|
||||||
alg: { value: '254' },
|
alg: { value: '254' },
|
||||||
|
|
@ -420,10 +452,9 @@ describe 'EPP Domain', epp: true do
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'does not create a domain with two identical dnskeys' do
|
it 'does not create a domain with two identical dnskeys' do
|
||||||
xml = domain_create_xml({
|
xml = domain_create_xml({}, {
|
||||||
dnssec: [
|
_other: [
|
||||||
{
|
{ keyData: {
|
||||||
dnskey: {
|
|
||||||
flags: { value: '257' },
|
flags: { value: '257' },
|
||||||
protocol: { value: '3' },
|
protocol: { value: '3' },
|
||||||
alg: { value: '3' },
|
alg: { value: '3' },
|
||||||
|
|
@ -431,14 +462,13 @@ describe 'EPP Domain', epp: true do
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
dnskey: {
|
keyData: {
|
||||||
flags: { value: '0' },
|
flags: { value: '0' },
|
||||||
protocol: { value: '3' },
|
protocol: { value: '3' },
|
||||||
alg: { value: '5' },
|
alg: { value: '5' },
|
||||||
pubKey: { value: '700b97b591ed27ec2590d19f06f88bba700b97b591ed27ec2590d19f' }
|
pubKey: { value: '700b97b591ed27ec2590d19f06f88bba700b97b591ed27ec2590d19f' }
|
||||||
}
|
}
|
||||||
}
|
}]
|
||||||
]
|
|
||||||
})
|
})
|
||||||
|
|
||||||
response = epp_request(xml, :xml)
|
response = epp_request(xml, :xml)
|
||||||
|
|
@ -453,10 +483,9 @@ describe 'EPP Domain', epp: true do
|
||||||
s.value = 1
|
s.value = 1
|
||||||
s.save
|
s.save
|
||||||
|
|
||||||
xml = domain_create_xml({
|
xml = domain_create_xml({}, {
|
||||||
dnssec: [
|
_other: [
|
||||||
{
|
{ keyData: {
|
||||||
dnskey: {
|
|
||||||
flags: { value: '257' },
|
flags: { value: '257' },
|
||||||
protocol: { value: '3' },
|
protocol: { value: '3' },
|
||||||
alg: { value: '3' },
|
alg: { value: '3' },
|
||||||
|
|
@ -464,14 +493,13 @@ describe 'EPP Domain', epp: true do
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
dnskey: {
|
keyData: {
|
||||||
flags: { value: '0' },
|
flags: { value: '0' },
|
||||||
protocol: { value: '3' },
|
protocol: { value: '3' },
|
||||||
alg: { value: '5' },
|
alg: { value: '5' },
|
||||||
pubKey: { value: '700b97b591ed27ec2590d19f06f88bba700b97b591ed27ec2590d19f' }
|
pubKey: { value: '700b97b591ed27ec2590d19f06f88bba700b97b591ed27ec2590d19f' }
|
||||||
}
|
}
|
||||||
}
|
}]
|
||||||
]
|
|
||||||
})
|
})
|
||||||
|
|
||||||
response = epp_request(xml, :xml)
|
response = epp_request(xml, :xml)
|
||||||
|
|
@ -479,6 +507,66 @@ describe 'EPP Domain', epp: true do
|
||||||
expect(response[:result_code]).to eq('2004')
|
expect(response[:result_code]).to eq('2004')
|
||||||
expect(response[:msg]).to eq('DNS keys count must be between 0-1')
|
expect(response[:msg]).to eq('DNS keys count must be between 0-1')
|
||||||
end
|
end
|
||||||
|
|
||||||
|
it 'creates domain with ds data' do
|
||||||
|
pending true
|
||||||
|
xml = domain_create_xml({}, {
|
||||||
|
_other: [
|
||||||
|
{ dsData: {
|
||||||
|
keyTag: { value: '12345' },
|
||||||
|
alg: { value: '3' },
|
||||||
|
digestType: { value: '1' },
|
||||||
|
digest: { value: '49FD46E6C4B45C55D4AC' }
|
||||||
|
}
|
||||||
|
}]
|
||||||
|
})
|
||||||
|
|
||||||
|
epp_request(xml, :xml)
|
||||||
|
|
||||||
|
d = Domain.first
|
||||||
|
ds = d.dnskeys.first
|
||||||
|
expect(ds.ds_key_tag).to eq('12345')
|
||||||
|
expect(ds.ds_alg).to eq(3)
|
||||||
|
expect(ds.ds_digest_type).to eq(1)
|
||||||
|
expect(ds.ds_digest).to eq('49FD46E6C4B45C55D4AC')
|
||||||
|
expect(ds.flags).to be_nil
|
||||||
|
expect(ds.protocol).to be_nil
|
||||||
|
expect(ds.alg).to be_nil
|
||||||
|
expect(ds.public_key).to be_nil
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'creates domain with ds data with key' do
|
||||||
|
xml = domain_create_xml({}, {
|
||||||
|
_other: [
|
||||||
|
{ dsData: {
|
||||||
|
keyTag: { value: '12345' },
|
||||||
|
alg: { value: '3' },
|
||||||
|
digestType: { value: '1' },
|
||||||
|
digest: { value: '49FD46E6C4B45C55D4AC' },
|
||||||
|
keyData: {
|
||||||
|
flags: { value: '0' },
|
||||||
|
protocol: { value: '3' },
|
||||||
|
alg: { value: '5' },
|
||||||
|
pubKey: { value: '700b97b591ed27ec2590d19f06f88bba700b97b591ed27ec2590d19f' }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}]
|
||||||
|
})
|
||||||
|
|
||||||
|
r = epp_request(xml, :xml)
|
||||||
|
|
||||||
|
d = Domain.first
|
||||||
|
ds = d.dnskeys.first
|
||||||
|
expect(ds.ds_key_tag).to eq('12345')
|
||||||
|
expect(ds.ds_alg).to eq(3)
|
||||||
|
expect(ds.ds_digest_type).to eq(1)
|
||||||
|
expect(ds.ds_digest).to eq('49FD46E6C4B45C55D4AC')
|
||||||
|
expect(ds.flags).to eq(0)
|
||||||
|
expect(ds.protocol).to eq(3)
|
||||||
|
expect(ds.alg).to eq(5)
|
||||||
|
expect(ds.public_key).to eq('700b97b591ed27ec2590d19f06f88bba700b97b591ed27ec2590d19f')
|
||||||
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
||||||
context 'with juridical persion as an owner' do
|
context 'with juridical persion as an owner' do
|
||||||
|
|
@ -525,7 +613,7 @@ describe 'EPP Domain', epp: true do
|
||||||
end
|
end
|
||||||
|
|
||||||
context 'with valid domain' do
|
context 'with valid domain' do
|
||||||
before(:each) { Fabricate(:domain, name: 'example.ee', registrar: EppUser.first.registrar) }
|
before(:each) { Fabricate(:domain, name: 'example.ee', registrar: EppUser.first.registrar, dnskeys: []) }
|
||||||
|
|
||||||
it 'renews a domain' do
|
it 'renews a domain' do
|
||||||
exp_date = (Date.today + 1.year)
|
exp_date = (Date.today + 1.year)
|
||||||
|
|
@ -566,8 +654,28 @@ describe 'EPP Domain', epp: true do
|
||||||
d.domain_statuses.build(value: DomainStatus::CLIENT_HOLD, description: 'Payment overdue.')
|
d.domain_statuses.build(value: DomainStatus::CLIENT_HOLD, description: 'Payment overdue.')
|
||||||
d.nameservers.build(hostname: 'ns1.example.com', ipv4: '192.168.1.1', ipv6: '1080:0:0:0:8:800:200C:417A')
|
d.nameservers.build(hostname: 'ns1.example.com', ipv4: '192.168.1.1', ipv6: '1080:0:0:0:8:800:200C:417A')
|
||||||
|
|
||||||
d.dnskeys.build(flags: 257, protocol: 3, alg: 3, public_key: 'AwEAAddt2AkLfYGKgiEZB5SmIF8EvrjxNMH6HtxWEA4RJ9Ao6LCWheg8')
|
d.dnskeys.build(
|
||||||
d.dnskeys.build(flags: 0, protocol: 3, alg: 5, public_key: '700b97b591ed27ec2590d19f06f88bba700b97b591ed27ec2590d19f')
|
ds_key_tag: '123',
|
||||||
|
ds_alg: 3,
|
||||||
|
ds_digest_type: 1,
|
||||||
|
ds_digest: 'abc',
|
||||||
|
flags: 257,
|
||||||
|
protocol: 3,
|
||||||
|
alg: 3,
|
||||||
|
public_key: 'AwEAAddt2AkLfYGKgiEZB5SmIF8EvrjxNMH6HtxWEA4RJ9Ao6LCWheg8'
|
||||||
|
)
|
||||||
|
|
||||||
|
d.dnskeys.build(
|
||||||
|
ds_key_tag: '123',
|
||||||
|
ds_alg: 3,
|
||||||
|
ds_digest_type: 1,
|
||||||
|
ds_digest: 'abc',
|
||||||
|
flags: 0,
|
||||||
|
protocol: 3,
|
||||||
|
alg: 5,
|
||||||
|
public_key: '700b97b591ed27ec2590d19f06f88bba700b97b591ed27ec2590d19f'
|
||||||
|
)
|
||||||
|
|
||||||
d.save
|
d.save
|
||||||
|
|
||||||
response = epp_request(domain_info_xml, :xml)
|
response = epp_request(domain_info_xml, :xml)
|
||||||
|
|
@ -580,12 +688,12 @@ describe 'EPP Domain', epp: true do
|
||||||
expect(inf_data.css('status').first[:s]).to eq('clientHold')
|
expect(inf_data.css('status').first[:s]).to eq('clientHold')
|
||||||
expect(inf_data.css('registrant').text).to eq(d.owner_contact_code)
|
expect(inf_data.css('registrant').text).to eq(d.owner_contact_code)
|
||||||
|
|
||||||
admin_contacts_from_request = inf_data.css('contact[type="admin"]').map { |x| x.text }
|
admin_contacts_from_request = inf_data.css('contact[type="admin"]').map(&:text)
|
||||||
admin_contacts_existing = d.admin_contacts.pluck(:code)
|
admin_contacts_existing = d.admin_contacts.pluck(:code)
|
||||||
|
|
||||||
expect(admin_contacts_from_request).to eq(admin_contacts_existing)
|
expect(admin_contacts_from_request).to eq(admin_contacts_existing)
|
||||||
|
|
||||||
hosts_from_request = inf_data.css('hostObj').map { |x| x.text }
|
hosts_from_request = inf_data.css('hostObj').map(&:text)
|
||||||
hosts_existing = d.nameservers.where(ipv4: nil).pluck(:hostname)
|
hosts_existing = d.nameservers.where(ipv4: nil).pluck(:hostname)
|
||||||
|
|
||||||
expect(hosts_from_request).to eq(hosts_existing)
|
expect(hosts_from_request).to eq(hosts_existing)
|
||||||
|
|
@ -597,13 +705,22 @@ describe 'EPP Domain', epp: true do
|
||||||
expect(inf_data.css('exDate').text).to eq(d.valid_to.to_time.utc.to_s)
|
expect(inf_data.css('exDate').text).to eq(d.valid_to.to_time.utc.to_s)
|
||||||
expect(inf_data.css('pw').text).to eq(d.auth_info)
|
expect(inf_data.css('pw').text).to eq(d.auth_info)
|
||||||
|
|
||||||
dnskey_1 = inf_data.css('dnskey')[0]
|
ds_data_1 = response[:parsed].css('dsData')[0]
|
||||||
|
|
||||||
|
expect(ds_data_1.css('keyTag').first.text).to eq('123')
|
||||||
|
expect(ds_data_1.css('alg').first.text).to eq('3')
|
||||||
|
expect(ds_data_1.css('digestType').first.text).to eq('1')
|
||||||
|
expect(ds_data_1.css('digest').first.text).to eq('abc')
|
||||||
|
|
||||||
|
dnskey_1 = ds_data_1.css('keyData')[0]
|
||||||
expect(dnskey_1.css('flags').first.text).to eq('257')
|
expect(dnskey_1.css('flags').first.text).to eq('257')
|
||||||
expect(dnskey_1.css('protocol').first.text).to eq('3')
|
expect(dnskey_1.css('protocol').first.text).to eq('3')
|
||||||
expect(dnskey_1.css('alg').first.text).to eq('3')
|
expect(dnskey_1.css('alg').first.text).to eq('3')
|
||||||
expect(dnskey_1.css('pubKey').first.text).to eq('AwEAAddt2AkLfYGKgiEZB5SmIF8EvrjxNMH6HtxWEA4RJ9Ao6LCWheg8')
|
expect(dnskey_1.css('pubKey').first.text).to eq('AwEAAddt2AkLfYGKgiEZB5SmIF8EvrjxNMH6HtxWEA4RJ9Ao6LCWheg8')
|
||||||
|
|
||||||
dnskey_2 = inf_data.css('dnskey')[1]
|
ds_data_2 = response[:parsed].css('dsData')[1]
|
||||||
|
|
||||||
|
dnskey_2 = ds_data_2.css('keyData')[0]
|
||||||
expect(dnskey_2.css('flags').first.text).to eq('0')
|
expect(dnskey_2.css('flags').first.text).to eq('0')
|
||||||
expect(dnskey_2.css('protocol').first.text).to eq('3')
|
expect(dnskey_2.css('protocol').first.text).to eq('3')
|
||||||
expect(dnskey_2.css('alg').first.text).to eq('5')
|
expect(dnskey_2.css('alg').first.text).to eq('5')
|
||||||
|
|
@ -632,9 +749,15 @@ describe 'EPP Domain', epp: true do
|
||||||
{ hostObj: { value: 'ns2.example.com' } }
|
{ hostObj: { value: 'ns2.example.com' } }
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
dnssec: [
|
_other: [
|
||||||
{
|
{ contact: { value: 'mak21', attrs: { type: 'tech' } } },
|
||||||
dnskey: {
|
{ status: { value: 'Payment overdue.', attrs: { s: 'clientHold', lang: 'en' } } },
|
||||||
|
{ status: { value: '', attrs: { s: 'clientUpdateProhibited' } } }
|
||||||
|
]
|
||||||
|
]
|
||||||
|
}, {
|
||||||
|
add: [
|
||||||
|
{ keyData: {
|
||||||
flags: { value: '0' },
|
flags: { value: '0' },
|
||||||
protocol: { value: '3' },
|
protocol: { value: '3' },
|
||||||
alg: { value: '5' },
|
alg: { value: '5' },
|
||||||
|
|
@ -642,19 +765,13 @@ describe 'EPP Domain', epp: true do
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
dnskey: {
|
keyData: {
|
||||||
flags: { value: '256' },
|
flags: { value: '256' },
|
||||||
protocol: { value: '3' },
|
protocol: { value: '3' },
|
||||||
alg: { value: '254' },
|
alg: { value: '254' },
|
||||||
pubKey: { value: '841936717ae427ace63c28d04918569a841936717ae427ace63c28d0' }
|
pubKey: { value: '841936717ae427ace63c28d04918569a841936717ae427ace63c28d0' }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
],
|
|
||||||
_other: [
|
|
||||||
{ contact: { value: 'mak21', attrs: { type: 'tech' } } },
|
|
||||||
{ status: { value: 'Payment overdue.', attrs: { s: 'clientHold', lang: 'en' } } },
|
|
||||||
{ status: { value: '', attrs: { s: 'clientUpdateProhibited' } } }
|
|
||||||
]
|
|
||||||
]
|
]
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|
@ -680,11 +797,9 @@ describe 'EPP Domain', epp: true do
|
||||||
expect(d.domain_statuses.first.value).to eq('clientHold')
|
expect(d.domain_statuses.first.value).to eq('clientHold')
|
||||||
|
|
||||||
expect(d.domain_statuses.last.value).to eq('clientUpdateProhibited')
|
expect(d.domain_statuses.last.value).to eq('clientUpdateProhibited')
|
||||||
|
|
||||||
expect(d.dnskeys.count).to eq(2)
|
expect(d.dnskeys.count).to eq(2)
|
||||||
|
|
||||||
response = epp_request(xml, :xml)
|
response = epp_request(xml, :xml)
|
||||||
|
|
||||||
expect(response[:results][0][:result_code]).to eq('2302')
|
expect(response[:results][0][:result_code]).to eq('2302')
|
||||||
expect(response[:results][0][:msg]).to eq('Nameserver already exists on this domain')
|
expect(response[:results][0][:msg]).to eq('Nameserver already exists on this domain')
|
||||||
expect(response[:results][0][:value]).to eq('ns1.example.com')
|
expect(response[:results][0][:value]).to eq('ns1.example.com')
|
||||||
|
|
@ -716,9 +831,15 @@ describe 'EPP Domain', epp: true do
|
||||||
{ hostObj: { value: 'ns2.example.com' } }
|
{ hostObj: { value: 'ns2.example.com' } }
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
dnssec: [
|
_other: [
|
||||||
{
|
{ contact: { value: 'mak21', attrs: { type: 'tech' } } },
|
||||||
dnskey: {
|
{ status: { value: 'Payment overdue.', attrs: { s: 'clientHold', lang: 'en' } } },
|
||||||
|
{ status: { value: '', attrs: { s: 'clientUpdateProhibited' } } }
|
||||||
|
]
|
||||||
|
]
|
||||||
|
}, {
|
||||||
|
add: [
|
||||||
|
{ keyData: {
|
||||||
flags: { value: '0' },
|
flags: { value: '0' },
|
||||||
protocol: { value: '3' },
|
protocol: { value: '3' },
|
||||||
alg: { value: '5' },
|
alg: { value: '5' },
|
||||||
|
|
@ -726,23 +847,19 @@ describe 'EPP Domain', epp: true do
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
dnskey: {
|
keyData: {
|
||||||
flags: { value: '256' },
|
flags: { value: '256' },
|
||||||
protocol: { value: '3' },
|
protocol: { value: '3' },
|
||||||
alg: { value: '254' },
|
alg: { value: '254' },
|
||||||
pubKey: { value: '841936717ae427ace63c28d04918569a841936717ae427ace63c28d0' }
|
pubKey: { value: '841936717ae427ace63c28d04918569a841936717ae427ace63c28d0' }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
],
|
|
||||||
_other: [
|
|
||||||
{ contact: { value: 'mak21', attrs: { type: 'tech' } } },
|
|
||||||
{ status: { value: 'Payment overdue.', attrs: { s: 'clientHold', lang: 'en' } } },
|
|
||||||
{ status: { value: '', attrs: { s: 'clientUpdateProhibited' } } }
|
|
||||||
]
|
|
||||||
]
|
]
|
||||||
})
|
})
|
||||||
|
|
||||||
epp_request(xml, :xml)
|
epp_request(xml, :xml)
|
||||||
|
d = Domain.last
|
||||||
|
expect(d.dnskeys.count).to eq(2)
|
||||||
|
|
||||||
xml = domain_update_xml({
|
xml = domain_update_xml({
|
||||||
rem: [
|
rem: [
|
||||||
|
|
@ -751,24 +868,22 @@ describe 'EPP Domain', epp: true do
|
||||||
{ hostObj: { value: 'ns1.example.com' } }
|
{ hostObj: { value: 'ns1.example.com' } }
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
dnssec: [
|
|
||||||
{
|
|
||||||
dnskey: {
|
|
||||||
pubKey: { value: '700b97b591ed27ec2590d19f06f88bba700b97b591ed27ec2590d19f' }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
],
|
|
||||||
_other: [
|
_other: [
|
||||||
{ contact: { value: 'mak21', attrs: { type: 'tech' } } },
|
{ contact: { value: 'mak21', attrs: { type: 'tech' } } },
|
||||||
{ status: { value: '', attrs: { s: 'clientHold' } } }
|
{ status: { value: '', attrs: { s: 'clientHold' } } }
|
||||||
]
|
]
|
||||||
]
|
]
|
||||||
|
}, {
|
||||||
|
rem: [
|
||||||
|
{ keyData: {
|
||||||
|
pubKey: { value: '700b97b591ed27ec2590d19f06f88bba700b97b591ed27ec2590d19f' }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
]
|
||||||
})
|
})
|
||||||
|
|
||||||
d = Domain.last
|
epp_request(xml, :xml)
|
||||||
expect(d.dnskeys.count).to eq(2)
|
|
||||||
|
|
||||||
response = epp_request(xml, :xml)
|
|
||||||
expect(d.dnskeys.count).to eq(1)
|
expect(d.dnskeys.count).to eq(1)
|
||||||
|
|
||||||
expect(d.domain_statuses.count).to eq(1)
|
expect(d.domain_statuses.count).to eq(1)
|
||||||
|
|
|
||||||
|
|
@ -16,19 +16,21 @@ describe 'EPP Helper', epp: true do
|
||||||
<domain:hostObj>ns2.example.net</domain:hostObj>
|
<domain:hostObj>ns2.example.net</domain:hostObj>
|
||||||
</domain:ns>
|
</domain:ns>
|
||||||
<domain:registrant>jd1234</domain:registrant>
|
<domain:registrant>jd1234</domain:registrant>
|
||||||
<domain:dnssec>
|
|
||||||
<domain:dnskey>
|
|
||||||
<domain:flags>257</domain:flags>
|
|
||||||
<domain:protocol>3</domain:protocol>
|
|
||||||
<domain:alg>5</domain:alg>
|
|
||||||
<domain:pubKey>AwEAAddt2AkLfYGKgiEZB5SmIF8EvrjxNMH6HtxWEA4RJ9Ao6LCWheg8</domain:pubKey>
|
|
||||||
</domain:dnskey>
|
|
||||||
</domain:dnssec>
|
|
||||||
<domain:contact type="admin">sh8013</domain:contact>
|
<domain:contact type="admin">sh8013</domain:contact>
|
||||||
<domain:contact type="tech">sh8013</domain:contact>
|
<domain:contact type="tech">sh8013</domain:contact>
|
||||||
<domain:contact type="tech">sh801333</domain:contact>
|
<domain:contact type="tech">sh801333</domain:contact>
|
||||||
</domain:create>
|
</domain:create>
|
||||||
</create>
|
</create>
|
||||||
|
<extension>
|
||||||
|
<secDNS:create xmlns:secDNS="urn:ietf:params:xml:ns:secDNS-1.1">
|
||||||
|
<secDNS:keyData>
|
||||||
|
<secDNS:flags>257</secDNS:flags>
|
||||||
|
<secDNS:protocol>3</secDNS:protocol>
|
||||||
|
<secDNS:alg>5</secDNS:alg>
|
||||||
|
<secDNS:pubKey>AwEAAddt2AkLfYGKgiEZB5SmIF8EvrjxNMH6HtxWEA4RJ9Ao6LCWheg8</secDNS:pubKey>
|
||||||
|
</secDNS:keyData>
|
||||||
|
</secDNS:create>
|
||||||
|
</extension>
|
||||||
<clTRID>ABC-12345</clTRID>
|
<clTRID>ABC-12345</clTRID>
|
||||||
</command>
|
</command>
|
||||||
</epp>
|
</epp>
|
||||||
|
|
@ -52,19 +54,21 @@ describe 'EPP Helper', epp: true do
|
||||||
<domain:hostObj>ns2.test.net</domain:hostObj>
|
<domain:hostObj>ns2.test.net</domain:hostObj>
|
||||||
</domain:ns>
|
</domain:ns>
|
||||||
<domain:registrant>32fsdaf</domain:registrant>
|
<domain:registrant>32fsdaf</domain:registrant>
|
||||||
<domain:dnssec>
|
|
||||||
<domain:dnskey>
|
|
||||||
<domain:flags>257</domain:flags>
|
|
||||||
<domain:protocol>3</domain:protocol>
|
|
||||||
<domain:alg>5</domain:alg>
|
|
||||||
<domain:pubKey>AwEAAddt2AkLfYGKgiEZB5SmIF8EvrjxNMH6HtxWEA4RJ9Ao6LCWheg8</domain:pubKey>
|
|
||||||
</domain:dnskey>
|
|
||||||
</domain:dnssec>
|
|
||||||
<domain:contact type="admin">2323rafaf</domain:contact>
|
<domain:contact type="admin">2323rafaf</domain:contact>
|
||||||
<domain:contact type="tech">3dgxx</domain:contact>
|
<domain:contact type="tech">3dgxx</domain:contact>
|
||||||
<domain:contact type="tech">345xxv</domain:contact>
|
<domain:contact type="tech">345xxv</domain:contact>
|
||||||
</domain:create>
|
</domain:create>
|
||||||
</create>
|
</create>
|
||||||
|
<extension>
|
||||||
|
<secDNS:create xmlns:secDNS="urn:ietf:params:xml:ns:secDNS-1.1">
|
||||||
|
<secDNS:keyData>
|
||||||
|
<secDNS:flags>257</secDNS:flags>
|
||||||
|
<secDNS:protocol>3</secDNS:protocol>
|
||||||
|
<secDNS:alg>5</secDNS:alg>
|
||||||
|
<secDNS:pubKey>AwEAAddt2AkLfYGKgiEZB5SmIF8EvrjxNMH6HtxWEA4RJ9Ao6LCWheg8</secDNS:pubKey>
|
||||||
|
</secDNS:keyData>
|
||||||
|
</secDNS:create>
|
||||||
|
</extension>
|
||||||
<clTRID>ABC-12345</clTRID>
|
<clTRID>ABC-12345</clTRID>
|
||||||
</command>
|
</command>
|
||||||
</epp>
|
</epp>
|
||||||
|
|
@ -109,9 +113,8 @@ describe 'EPP Helper', epp: true do
|
||||||
period: nil,
|
period: nil,
|
||||||
ns: nil,
|
ns: nil,
|
||||||
registrant: nil,
|
registrant: nil,
|
||||||
_other: nil,
|
_other: nil
|
||||||
dnssec: nil
|
}, false)
|
||||||
})
|
|
||||||
|
|
||||||
generated = Nokogiri::XML(xml).to_s.squish
|
generated = Nokogiri::XML(xml).to_s.squish
|
||||||
expect(generated).to eq(expected)
|
expect(generated).to eq(expected)
|
||||||
|
|
@ -452,7 +455,6 @@ describe 'EPP Helper', epp: true do
|
||||||
generated = Nokogiri::XML(domain_delete_xml).to_s.squish
|
generated = Nokogiri::XML(domain_delete_xml).to_s.squish
|
||||||
expect(generated).to eq(expected)
|
expect(generated).to eq(expected)
|
||||||
|
|
||||||
|
|
||||||
expected = Nokogiri::XML('<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
expected = Nokogiri::XML('<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||||
<epp xmlns="urn:ietf:params:xml:ns:epp-1.0">
|
<epp xmlns="urn:ietf:params:xml:ns:epp-1.0">
|
||||||
<command>
|
<command>
|
||||||
|
|
|
||||||
7
spec/fabricators/dnskey_fabricator.rb
Normal file
7
spec/fabricators/dnskey_fabricator.rb
Normal file
|
|
@ -0,0 +1,7 @@
|
||||||
|
Fabricator(:dnskey) do
|
||||||
|
alg 8
|
||||||
|
flags 257
|
||||||
|
protocol 3
|
||||||
|
public_key 'AwEAAaOf5+lz3ftsL+0CCvfJbhUF/NVsNh8BKo61oYs5fXVbuWDiH872 LC8uKDO92TJy7Q4TF9XMAKMMlf1GMAxlRspD749SOCTN00sqfWx1OMTu a28L1PerwHq7665oDJDKqR71btcGqyLKhe2QDvCdA0mENimF1NudX1BJ DDFi6oOZ0xE/0CuveB64I3ree7nCrwLwNs56kXC4LYoX3XdkOMKiJLL/ MAhcxXa60CdZLoRtTEW3z8/oBq4hEAYMCNclpbd6y/exScwBxFTdUfFk KsdNcmvai1lyk9vna0WQrtpYpHKMXvY9LFHaJxCOLR4umfeQ42RuTd82 lqfU6ClMeXs='
|
||||||
|
ds_digest_type 2
|
||||||
|
end
|
||||||
|
|
@ -8,4 +8,5 @@ Fabricator(:domain) do
|
||||||
admin_contacts(count: 1) { Fabricate(:contact) }
|
admin_contacts(count: 1) { Fabricate(:contact) }
|
||||||
registrar
|
registrar
|
||||||
auth_info '98oiewslkfkd'
|
auth_info '98oiewslkfkd'
|
||||||
|
dnskeys(count: 1)
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -38,3 +38,15 @@ Fabricator(:domain_general_setting_group, from: :setting_group) do
|
||||||
]
|
]
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
Fabricator(:dnskeys_setting_group, from: :setting_group) do
|
||||||
|
code 'dnskeys'
|
||||||
|
settings do
|
||||||
|
[
|
||||||
|
Fabricate(:setting, code: Setting::DS_ALGORITHM, value: 2),
|
||||||
|
Fabricate(:setting, code: Setting::ALLOW_DS_DATA, value: 1),
|
||||||
|
Fabricate(:setting, code: Setting::ALLOW_DS_DATA_WITH_KEYS, value: 1),
|
||||||
|
Fabricate(:setting, code: Setting::ALLOW_KEY_DATA, value: 1)
|
||||||
|
]
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
|
||||||
|
|
@ -51,6 +51,7 @@ describe Contact, '#relations_with_domain?' do
|
||||||
context 'with relation' do
|
context 'with relation' do
|
||||||
before(:each) do
|
before(:each) do
|
||||||
Fabricate(:domain_validation_setting_group)
|
Fabricate(:domain_validation_setting_group)
|
||||||
|
Fabricate(:dnskeys_setting_group)
|
||||||
Fabricate(:domain)
|
Fabricate(:domain)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
@ -74,7 +75,9 @@ end
|
||||||
|
|
||||||
describe Contact, '#up_id' do
|
describe Contact, '#up_id' do
|
||||||
before(:each) do
|
before(:each) do
|
||||||
#Fabricate(:contact, code: 'asd12', created_by: Fabricate(:epp_user), updated_by: Fabricate(:epp_user), registrar: zone)
|
# Fabricate(:contact, code: 'asd12',
|
||||||
|
# created_by: Fabricate(:epp_user),
|
||||||
|
# updated_by: Fabricate(:epp_user), registrar: zone)
|
||||||
@epp_user = Fabricate(:epp_user)
|
@epp_user = Fabricate(:epp_user)
|
||||||
@contact = Fabricate.build(:contact, code: 'asd12', created_by: @epp_user, updated_by: @epp_user)
|
@contact = Fabricate.build(:contact, code: 'asd12', created_by: @epp_user, updated_by: @epp_user)
|
||||||
end
|
end
|
||||||
|
|
|
||||||
18
spec/models/dnskey_spec.rb
Normal file
18
spec/models/dnskey_spec.rb
Normal file
|
|
@ -0,0 +1,18 @@
|
||||||
|
require 'rails_helper'
|
||||||
|
|
||||||
|
describe Dnskey do
|
||||||
|
before(:each) do
|
||||||
|
Fabricate(:domain_validation_setting_group)
|
||||||
|
Fabricate(:dnskeys_setting_group)
|
||||||
|
end
|
||||||
|
|
||||||
|
it { should belong_to(:domain) }
|
||||||
|
|
||||||
|
it 'generates digest' do
|
||||||
|
d = Fabricate(:domain, name: 'ria.ee')
|
||||||
|
ds = d.dnskeys.first
|
||||||
|
|
||||||
|
ds.generate_digest
|
||||||
|
expect(ds.ds_digest).to eq('0B62D1BC64EFD1EE652FB102BDF1011BF514CCD9A1A0CFB7472AEA3B01F38C92')
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
@ -7,9 +7,13 @@ describe Domain do
|
||||||
it { should have_many(:tech_contacts) }
|
it { should have_many(:tech_contacts) }
|
||||||
it { should have_many(:admin_contacts) }
|
it { should have_many(:admin_contacts) }
|
||||||
it { should have_many(:domain_transfers) }
|
it { should have_many(:domain_transfers) }
|
||||||
|
it { should have_many(:dnskeys) }
|
||||||
|
|
||||||
context 'with sufficient settings' do
|
context 'with sufficient settings' do
|
||||||
before(:each) { Fabricate(:domain_validation_setting_group) }
|
before(:each) do
|
||||||
|
Fabricate(:domain_validation_setting_group)
|
||||||
|
Fabricate(:dnskeys_setting_group)
|
||||||
|
end
|
||||||
|
|
||||||
it 'validates domain name' do
|
it 'validates domain name' do
|
||||||
d = Fabricate(:domain)
|
d = Fabricate(:domain)
|
||||||
|
|
|
||||||
|
|
@ -52,7 +52,7 @@ module Epp
|
||||||
|
|
||||||
### REQUEST TEMPLATES ###
|
### REQUEST TEMPLATES ###
|
||||||
|
|
||||||
def domain_create_xml(xml_params = {})
|
def domain_create_xml(xml_params = {}, dnssec_params = {})
|
||||||
|
|
||||||
defaults = {
|
defaults = {
|
||||||
name: { value: 'example.ee' },
|
name: { value: 'example.ee' },
|
||||||
|
|
@ -62,16 +62,6 @@ module Epp
|
||||||
{ hostObj: { value: 'ns2.example.net' } }
|
{ hostObj: { value: 'ns2.example.net' } }
|
||||||
],
|
],
|
||||||
registrant: { value: 'jd1234' },
|
registrant: { value: 'jd1234' },
|
||||||
dnssec: [
|
|
||||||
{
|
|
||||||
dnskey: {
|
|
||||||
flags: { value: '257' },
|
|
||||||
protocol: { value: '3' },
|
|
||||||
alg: { value: '5' },
|
|
||||||
pubKey: { value: 'AwEAAddt2AkLfYGKgiEZB5SmIF8EvrjxNMH6HtxWEA4RJ9Ao6LCWheg8' }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
],
|
|
||||||
_other: [
|
_other: [
|
||||||
{ contact: { value: 'sh8013', attrs: { type: 'admin' } } },
|
{ contact: { value: 'sh8013', attrs: { type: 'admin' } } },
|
||||||
{ contact: { value: 'sh8013', attrs: { type: 'tech' } } },
|
{ contact: { value: 'sh8013', attrs: { type: 'tech' } } },
|
||||||
|
|
@ -81,6 +71,19 @@ module Epp
|
||||||
|
|
||||||
xml_params = defaults.deep_merge(xml_params)
|
xml_params = defaults.deep_merge(xml_params)
|
||||||
|
|
||||||
|
dsnsec_defaults = {
|
||||||
|
_other: [
|
||||||
|
{ keyData: {
|
||||||
|
flags: { value: '257' },
|
||||||
|
protocol: { value: '3' },
|
||||||
|
alg: { value: '5' },
|
||||||
|
pubKey: { value: 'AwEAAddt2AkLfYGKgiEZB5SmIF8EvrjxNMH6HtxWEA4RJ9Ao6LCWheg8' }
|
||||||
|
}
|
||||||
|
}]
|
||||||
|
}
|
||||||
|
|
||||||
|
dnssec_params = dsnsec_defaults.deep_merge(dnssec_params) if dnssec_params != false
|
||||||
|
|
||||||
xml = Builder::XmlMarkup.new
|
xml = Builder::XmlMarkup.new
|
||||||
|
|
||||||
xml.instruct!(:xml, standalone: 'no')
|
xml.instruct!(:xml, standalone: 'no')
|
||||||
|
|
@ -91,6 +94,11 @@ module Epp
|
||||||
generate_xml_from_hash(xml_params, xml, 'domain')
|
generate_xml_from_hash(xml_params, xml, 'domain')
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
xml.extension do
|
||||||
|
xml.tag!('secDNS:create', 'xmlns:secDNS' => 'urn:ietf:params:xml:ns:secDNS-1.1') do
|
||||||
|
generate_xml_from_hash(dnssec_params, xml, 'secDNS')
|
||||||
|
end
|
||||||
|
end if dnssec_params != false
|
||||||
xml.clTRID 'ABC-12345'
|
xml.clTRID 'ABC-12345'
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
@ -161,7 +169,7 @@ module Epp
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
def domain_update_xml(xml_params = {})
|
def domain_update_xml(xml_params = {}, dnssec_params = false)
|
||||||
defaults = {
|
defaults = {
|
||||||
name: { value: 'example.ee' }
|
name: { value: 'example.ee' }
|
||||||
}
|
}
|
||||||
|
|
@ -178,6 +186,12 @@ module Epp
|
||||||
generate_xml_from_hash(xml_params, xml, 'domain')
|
generate_xml_from_hash(xml_params, xml, 'domain')
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
xml.extension do
|
||||||
|
xml.tag!('secDNS:create', 'xmlns:secDNS' => 'urn:ietf:params:xml:ns:secDNS-1.1') do
|
||||||
|
generate_xml_from_hash(dnssec_params, xml, 'secDNS')
|
||||||
|
end
|
||||||
|
end if dnssec_params != false
|
||||||
xml.clTRID 'ABC-12345'
|
xml.clTRID 'ABC-12345'
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue