From ce15a708a0afffc3dd398724fe51a608a0f2af19 Mon Sep 17 00:00:00 2001 From: olegphenomenon Date: Mon, 11 Oct 2021 15:40:13 +0300 Subject: [PATCH 1/3] change flags in openssl cert generator --- app/models/certificate.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/certificate.rb b/app/models/certificate.rb index 8dabc1b5a..e51dda2eb 100644 --- a/app/models/certificate.rb +++ b/app/models/certificate.rb @@ -83,7 +83,7 @@ class Certificate < ApplicationRecord crt_file = Tempfile.new('client_crt') _out, err, _st = Open3.capture3('openssl', 'ca', '-config', ENV['openssl_config_path'], '-keyfile', ENV['ca_key_path'], '-cert', ENV['ca_cert_path'], - '-extensions', 'usr_cert', '-notext', '-md sha256', + '-extensions', 'usr_cert', '-notext', '-md', 'sha256', '-in', csr_file.path, '-out', crt_file.path, '-key', ENV['ca_key_password'], '-batch') From 357900c28f54416f1c6df1e6bfe26e52076e838b Mon Sep 17 00:00:00 2001 From: olegphenomenon Date: Mon, 11 Oct 2021 16:43:26 +0300 Subject: [PATCH 2/3] changed test --- test/system/registrar_area/bulk_change/nameserver_test.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/system/registrar_area/bulk_change/nameserver_test.rb b/test/system/registrar_area/bulk_change/nameserver_test.rb index b6aa37e59..fa47d8b19 100644 --- a/test/system/registrar_area/bulk_change/nameserver_test.rb +++ b/test/system/registrar_area/bulk_change/nameserver_test.rb @@ -3,7 +3,7 @@ require 'application_system_test_case' class RegistrarAreaNameserverBulkChangeTest < ApplicationSystemTestCase setup do sign_in users(:api_goodnames) - Capybara.default_max_wait_time = 5 + Capybara.default_max_wait_time = 10 end def test_replaces_current_registrar_nameservers @@ -28,7 +28,7 @@ class RegistrarAreaNameserverBulkChangeTest < ApplicationSystemTestCase click_link 'Bulk change' click_link 'Nameserver' - fill_in 'Old hostname', with: 'ns1.bestnames.test' + fill_in 'Old hostname (optional)', with: 'ns1.bestnames.test' fill_in 'New hostname', with: 'new-ns.bestnames.test' fill_in 'ipv4', with: "192.0.2.55\n192.0.2.56" fill_in 'ipv6', with: "2001:db8::55\n2001:db8::56" From b3d686dd5728165c9947c300cf96527ec97b2eee Mon Sep 17 00:00:00 2001 From: olegphenomenon Date: Mon, 11 Oct 2021 16:48:45 +0300 Subject: [PATCH 3/3] changed tests --- test/system/registrar_area/bulk_change/nameserver_test.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/system/registrar_area/bulk_change/nameserver_test.rb b/test/system/registrar_area/bulk_change/nameserver_test.rb index fa47d8b19..cfde8e6d1 100644 --- a/test/system/registrar_area/bulk_change/nameserver_test.rb +++ b/test/system/registrar_area/bulk_change/nameserver_test.rb @@ -49,14 +49,14 @@ class RegistrarAreaNameserverBulkChangeTest < ApplicationSystemTestCase click_link 'Bulk change' click_link 'Nameserver' - fill_in 'Old hostname', with: 'old hostname' + fill_in 'Old hostname (optional)', with: 'old hostname' fill_in 'New hostname', with: 'new hostname' fill_in 'ipv4', with: 'ipv4' fill_in 'ipv6', with: 'ipv6' click_on 'Replace/Add nameserver' assert_text 'epic fail' - assert_field 'Old hostname', with: 'old hostname' + assert_field 'Old hostname (optional)', with: 'old hostname' assert_field 'New hostname', with: 'new hostname' assert_field 'ipv4', with: 'ipv4' assert_field 'ipv6', with: 'ipv6' @@ -82,7 +82,7 @@ class RegistrarAreaNameserverBulkChangeTest < ApplicationSystemTestCase click_link 'Bulk change' click_link 'Nameserver' - fill_in 'Old hostname', with: 'ns1.bestnames.test' + fill_in 'Old hostname (optional)', with: 'ns1.bestnames.test' fill_in 'New hostname', with: 'new-ns.bestnames.test' fill_in 'ipv4', with: "192.0.2.55\n192.0.2.56" fill_in 'ipv6', with: "2001:db8::55\n2001:db8::56" @@ -103,7 +103,7 @@ class RegistrarAreaNameserverBulkChangeTest < ApplicationSystemTestCase click_link 'Bulk change' click_link 'Nameserver' - fill_in 'Old hostname', with: nameserver.hostname + fill_in 'Old hostname (optional)', with: nameserver.hostname fill_in 'New hostname', with: 'new-ns.bestnames.test' fill_in 'ipv4', with: "192.0.2.55\n192.0.2.56" fill_in 'ipv6', with: "2001:db8::55\n2001:db8::56"