From ba41e758a786158c695229faa1068c06717bf79f Mon Sep 17 00:00:00 2001 From: "A. Wilcox" Date: Tue, 23 Jun 2020 19:13:03 -0500 Subject: Change Runner.Validate.hostname.Begin to allow numeric characters --- devel/requirements/3b_runner.xml | 2 +- hscript/meta.cc | 4 ++-- tests/spec/validator_spec.rb | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/devel/requirements/3b_runner.xml b/devel/requirements/3b_runner.xml index 7660661..a5080fe 100644 --- a/devel/requirements/3b_runner.xml +++ b/devel/requirements/3b_runner.xml @@ -196,7 +196,7 @@ Runner.Validate.hostname.Begin - The system shall verify that the value for the hostname key begins with an alphabetical character. + The system shall verify that the value for the hostname key begins with an alphanumeric character. Runner.Validate.hostname.Length diff --git a/hscript/meta.cc b/hscript/meta.cc index 52ed3db..15734c5 100644 --- a/hscript/meta.cc +++ b/hscript/meta.cc @@ -43,9 +43,9 @@ bool Hostname::validate() const { bool any_failure = false; std::string::size_type last_dot = 0, next_dot = 0; - if(!isalpha(this->_value[0])) { + if(!isalnum(this->_value[0])) { any_failure = true; - output_error(pos, "hostname: must start with alphabetical character"); + output_error(pos, "hostname: must start with alphanumeric character"); } if(this->_value.size() > 320) { diff --git a/tests/spec/validator_spec.rb b/tests/spec/validator_spec.rb index 0bd3516..a5e11e6 100644 --- a/tests/spec/validator_spec.rb +++ b/tests/spec/validator_spec.rb @@ -136,7 +136,8 @@ RSpec.describe 'HorizonScript validation', :type => :aruba do it "with non-alphabetical first character" do use_fixture '0024-numeric-hostname.installfile' run_validate - expect(last_command_started).to have_output(/error: .*hostname.*/) + expect(last_command_started).to have_output(PARSER_SUCCESS) + expect(last_command_started).to have_output(VALIDATOR_SUCCESS) end # Runner.Validate.hostname.Length it "with >320 characters" do -- cgit v1.2.3-60-g2f50