Hello community, here is the log from the commit of package yast2-users for openSUSE:Factory checked in at 2017-09-09 20:22:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-users (Old) and /work/SRC/openSUSE:Factory/.yast2-users.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-users" Sat Sep 9 20:22:22 2017 rev:204 rq:521622 version:3.2.12 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-users/yast2-users.changes 2017-04-12 17:08:55.165237734 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-users.new/yast2-users.changes 2017-09-09 20:22:22.981202354 +0200 @@ -1,0 +2,6 @@ +Tue Sep 5 14:47:25 UTC 2017 - [email protected] + +- Do not freeze while parsing authorized_keys (bsc#1053564) +- 3.2.12 + +------------------------------------------------------------------- Old: ---- yast2-users-3.2.11.tar.bz2 New: ---- yast2-users-3.2.12.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-users.spec ++++++ --- /var/tmp/diff_new_pack.CLYabg/_old 2017-09-09 20:22:23.457135269 +0200 +++ /var/tmp/diff_new_pack.CLYabg/_new 2017-09-09 20:22:23.469133578 +0200 @@ -17,7 +17,7 @@ Name: yast2-users -Version: 3.2.11 +Version: 3.2.12 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-users-3.2.11.tar.bz2 -> yast2-users-3.2.12.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-3.2.11/.travis.yml new/yast2-users-3.2.12/.travis.yml --- old/yast2-users-3.2.11/.travis.yml 2017-03-30 14:56:05.948998414 +0200 +++ new/yast2-users-3.2.12/.travis.yml 2017-09-06 10:04:56.154656082 +0200 @@ -5,7 +5,10 @@ before_install: - docker build -t yast-users-image . + # list the installed packages (just for easier debugging) + - docker run --rm -it yast-users-image rpm -qa | sort + script: - # the "yast-travis-cpp" script is included in the base yastdevel/cpp image - # see https://github.com/yast/docker-yast-cpp/blob/master/yast-travis-cpp + # the "yast-travis-ruby" script is included in the base yastdevel/ruby image + # see https://github.com/yast/docker-yast-ruby/blob/master/yast-travis-ruby - docker run -it -e TRAVIS=1 -e TRAVIS_JOB_ID="$TRAVIS_JOB_ID" yast-users-image yast-travis-cpp diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-3.2.11/Dockerfile new/yast2-users-3.2.12/Dockerfile --- old/yast2-users-3.2.11/Dockerfile 2017-03-30 14:56:05.968998414 +0200 +++ new/yast2-users-3.2.12/Dockerfile 2017-09-06 10:04:56.158656082 +0200 @@ -3,6 +3,7 @@ cracklib-devel \ perl-Digest-SHA1 \ yast2 \ + yast2-ldap \ yast2-perl-bindings \ yast2-security \ yast2-testsuite diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-3.2.11/package/yast2-users.changes new/yast2-users-3.2.12/package/yast2-users.changes --- old/yast2-users-3.2.11/package/yast2-users.changes 2017-03-30 14:56:06.008998414 +0200 +++ new/yast2-users-3.2.12/package/yast2-users.changes 2017-09-06 10:04:56.166656082 +0200 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Sep 5 14:47:25 UTC 2017 - [email protected] + +- Do not freeze while parsing authorized_keys (bsc#1053564) +- 3.2.12 + +------------------------------------------------------------------- Thu Mar 16 15:35:45 UTC 2017 - [email protected] - Fixed a string comparison in Users perl module. (bsc#1029528) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-3.2.11/package/yast2-users.spec new/yast2-users-3.2.12/package/yast2-users.spec --- old/yast2-users-3.2.11/package/yast2-users.spec 2017-03-30 14:56:06.008998414 +0200 +++ new/yast2-users-3.2.12/package/yast2-users.spec 2017-09-06 10:04:56.166656082 +0200 @@ -17,7 +17,7 @@ Name: yast2-users -Version: 3.2.11 +Version: 3.2.12 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-3.2.11/src/lib/users/ssh_authorized_keys_file.rb new/yast2-users-3.2.12/src/lib/users/ssh_authorized_keys_file.rb --- old/yast2-users-3.2.11/src/lib/users/ssh_authorized_keys_file.rb 2017-03-30 14:56:06.252998414 +0200 +++ new/yast2-users-3.2.12/src/lib/users/ssh_authorized_keys_file.rb 2017-09-06 10:04:56.170656082 +0200 @@ -61,10 +61,6 @@ @keys end - # https://github.com/jordansissel/ruby-sshkeyauth/commit/12c9bb34399babf4040337e5695f3f453cd6745e#diff-4d8f3d488c1e25a30942c0e90f4e6ce4R14 - AUTHORIZED_KEYS_REGEX = - /\A((?:[A-Za-z0-9-]+(?:="[^"]+")?,?)+)? *((?:ssh|ecdsa)-[^ ]+) *([^ ]+) *(.+)?\z/ - # Validate and add a key to the keyring # # The key is validated before adding it to the keyring. @@ -98,7 +94,10 @@ keys end - # Determines is a string qualifies like a valid keys + # https://github.com/puppetlabs/puppet/blob/master/lib/puppet/type/ssh_authorized_key.rb#L138 + AUTHORIZED_KEYS_REGEX = /\A(?<env>(.+)\s+)?(?<type>(ssh|ecdsa)-\S+)\s+(?<key>[^ ]+)\s*(?<comment>.*)\z/ + + # Determine is a string qualifies like a valid key # # @param key [String] SSH authorized keys # @return [Boolean] +true+ if it's valid; +false+ otherwise diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-3.2.11/test/fixtures/home/user1/.ssh/authorized_keys new/yast2-users-3.2.12/test/fixtures/home/user1/.ssh/authorized_keys --- old/yast2-users-3.2.11/test/fixtures/home/user1/.ssh/authorized_keys 2017-03-30 14:56:06.388998414 +0200 +++ new/yast2-users-3.2.12/test/fixtures/home/user1/.ssh/authorized_keys 2017-09-06 10:04:56.182656082 +0200 @@ -1,2 +1,8 @@ +# valid key with environment and comment environment="PATH=/usr/local/bin:$PATH",command="/srv/logon.sh $USER" ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCpZC8ctjmn90B/MxLOdSjYM3Yl3qd+BhTWYdBNgO3B1fJ1JSegTgCpDM0krMHqd/OAslW5H3MRED7g7g9WkKZh5xTMGvH56yRitJySfSiK8uSxCu6Jg7NM11kqOs5/RwycHO8955QrEYyiWOx80unD+CBJxGEZCOu/DH3ca4yEigAt2HSuC8NPicmRJWua6IbDa+VSICvdOTdFTM8izScSd5WBFH1ULz0bBfLnyi/pIiMjuHB69AN4gsUGYgKjzUsnufKli+DmzACgVWTdQ3Ukax/4/wgXFMr3KsDNpTbn7ZZOKzPpIXpzlP9AwbHQdym6J2NAPYV+DDY3Kcr/vql9 [email protected] -ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCZXHfWaMch5VrgbogbW8lVuuwYCxQrgh00fF0V+GBBc0F6sux+WFlIENRLDNDSGBWol1X9LnbpgElzgM/PDX/3Uj+p+LVkt7sTk4k3tQQqFkrHEC+1TFnRk22AB4Xcw5KQ/bQnw1Cu0IfA/8c3c3Eh56WNiNi6F/bUeYKsdLLueGC/wKO/dCjM5xsLy/tXALrH0Y4NKbIZauM4BcEnZ7Cl6Wzl1AT/Mg+UK7bD8onufNd1l2w0rC0+BEy8VtBBobicp/Wv3nKkumKpNzP6jvpFE8CKiGx/fYzH/pLfe7bxEfBkKyR7A4gGWv6GHUaCYV+T+nac2ctWLLne1uQhRZcj [email protected] \ No newline at end of file +# valid key with comment +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCZXHfWaMch5VrgbogbW8lVuuwYCxQrgh00fF0V+GBBc0F6sux+WFlIENRLDNDSGBWol1X9LnbpgElzgM/PDX/3Uj+p+LVkt7sTk4k3tQQqFkrHEC+1TFnRk22AB4Xcw5KQ/bQnw1Cu0IfA/8c3c3Eh56WNiNi6F/bUeYKsdLLueGC/wKO/dCjM5xsLy/tXALrH0Y4NKbIZauM4BcEnZ7Cl6Wzl1AT/Mg+UK7bD8onufNd1l2w0rC0+BEy8VtBBobicp/Wv3nKkumKpNzP6jvpFE8CKiGx/fYzH/pLfe7bxEfBkKyR7A4gGWv6GHUaCYV+T+nac2ctWLLne1uQhRZcj [email protected] +# minimal key +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCZXHfWaMch5VrgbogbW8lVuuwYCxQrgh00fF0V+GBBc0F6sux+WFlIENRLDNDSGBWol1X9LnbpgElzgM/PDX/3Uj+p+LVkt7sTk4k3tQQqFkrHEC+1TFnRk22AB4Xcw5KQ/bQnw1Cu0IfA/8c3c3Eh56WNiNi6F/bUeYKsdLLueGC/wKO/dCjM5xsLy/tXALrH0Y4NKbIZauM4BcEnZ7Cl6Wzl1AT/Mg+UK7bD8onufNd1l2w0rC0+BEy8VtBBobicp/Wv3nKkumKpNzP6jvpFE8CKiGx/fYzH/pLfe7bxEfBkKyR7A4gGWv6GHUaCYV+T+nac2ctWLLne1uQhRZcj +# not valid key +AAAAB3NzaC1yc2EAAAADAQABAAABAQCZXHfWaMch5VrgbogbW8lVuuwYCxQrgh00fF0V+GBBc0F6sux+WFlIENRLDNDSGBWol1X9LnbpgElzgM/PDX/3Uj+p+LVkt7sTk4k3tQQqFkrHEC+1TFnRk22AB4Xcw5KQ/bQnw1Cu0IfA/8c3c3Eh56WNiNi6F/bUeYKsdLLueGC/wKO/dCjM5xsLy/tXALrH0Y4NKbIZauM4BcEnZ7Cl6Wzl1AT/Mg+UK7bD8onufNd1l2w0rC0+BEy8VtBBobicp/Wv3nKkumKpNzP6jvpFE8CKiGx/fYzH/pLfe7bxEfBkKyR7A4gGWv6GHUaCYV+T+nac2ctWLLne1uQhRZcj [email protected] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-3.2.11/test/lib/users/ssh_authorized_keys_file_test.rb new/yast2-users-3.2.12/test/lib/users/ssh_authorized_keys_file_test.rb --- old/yast2-users-3.2.11/test/lib/users/ssh_authorized_keys_file_test.rb 2017-03-30 14:56:06.436998414 +0200 +++ new/yast2-users-3.2.12/test/lib/users/ssh_authorized_keys_file_test.rb 2017-09-06 10:04:56.186656082 +0200 @@ -36,9 +36,10 @@ let(:path) { FIXTURES_PATH.join("home", "user1", ".ssh", "authorized_keys") } it "returns the keys that are present in the file" do - first, second = subject.keys + first, second, third = subject.keys expect(first).to match(/environment=.+/) expect(second).to match(/ssh-rsa/) + expect(third).to match(/ssh-rsa/) end end
