Skip to content

Commit 172415c

Browse files
committed
fix regex for owner/group matching to the end of string
1 parent bb0566d commit 172415c

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

lib/puppet/type/dhparam.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,14 @@
3939
newproperty(:owner) do
4040
desc 'owner of the file'
4141
validate do |value|
42-
raise ArgumentError, "#{value} is not a valid user name" unless value =~ %r{^\w+}
42+
raise ArgumentError, "#{value} is not a valid user name" unless value =~ %r{^\w+$}
4343
end
4444
end
4545

4646
newproperty(:group) do
4747
desc 'group of the file'
4848
validate do |value|
49-
raise ArgumentError, "#{value} is not a valid group name" unless value =~ %r{^\w+}
49+
raise ArgumentError, "#{value} is not a valid group name" unless value =~ %r{^\w+$}
5050
end
5151
end
5252

lib/puppet/type/ssl_pkey.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,14 +46,14 @@
4646
newproperty(:owner) do
4747
desc 'owner of the file'
4848
validate do |value|
49-
raise ArgumentError, "#{value} is not a valid user name" unless value =~ %r{^\w+}
49+
raise ArgumentError, "#{value} is not a valid user name" unless value =~ %r{^\w+$}
5050
end
5151
end
5252

5353
newproperty(:group) do
5454
desc 'group of the file'
5555
validate do |value|
56-
raise ArgumentError, "#{value} is not a valid group name" unless value =~ %r{^\w+}
56+
raise ArgumentError, "#{value} is not a valid group name" unless value =~ %r{^\w+$}
5757
end
5858
end
5959

lib/puppet/type/x509_cert.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,14 +79,14 @@
7979
newproperty(:owner) do
8080
desc 'owner of the file'
8181
validate do |value|
82-
raise ArgumentError, "#{value} is not a valid user name" unless value =~ %r{^\w+}
82+
raise ArgumentError, "#{value} is not a valid user name" unless value =~ %r{^\w+$}
8383
end
8484
end
8585

8686
newproperty(:group) do
8787
desc 'group of the file'
8888
validate do |value|
89-
raise ArgumentError, "#{value} is not a valid group name" unless value =~ %r{^\w+}
89+
raise ArgumentError, "#{value} is not a valid group name" unless value =~ %r{^\w+$}
9090
end
9191
end
9292

lib/puppet/type/x509_request.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,14 +57,14 @@
5757
newproperty(:owner) do
5858
desc 'owner of the file'
5959
validate do |value|
60-
raise ArgumentError, "#{value} is not a valid user name" unless value =~ %r{^\w+}
60+
raise ArgumentError, "#{value} is not a valid user name" unless value =~ %r{^\w+$}
6161
end
6262
end
6363

6464
newproperty(:group) do
6565
desc 'group of the file'
6666
validate do |value|
67-
raise ArgumentError, "#{value} is not a valid group name" unless value =~ %r{^\w+}
67+
raise ArgumentError, "#{value} is not a valid group name" unless value =~ %r{^\w+$}
6868
end
6969
end
7070

0 commit comments

Comments
 (0)