crowbar-client 3.5.0 → 3.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 0cb6df7f08aa6f28deb61db78bbe516ecb1e6b69
-  data.tar.gz: 6cf5ccf3a8615e0dc14dad2d4be8c1701c55c092
+SHA256:
+  metadata.gz: 2c9a64b119a2dbd5c8337f1a4c9d8524cb145c16e0e15796ccb131170872ab47
+  data.tar.gz: 02e5f441dfe055079ed8474fc04c542439fbd6f214e34d5767f740b1bfcad038
 SHA512:
-  metadata.gz: c3039b22d3902c1ac33d07f2afa80bb425543171a1eccd985b8d1b415f8933e30f3ec216e1963537c36b52add90ab577f44379ab205256a6d776eec96bc48e05
-  data.tar.gz: 3810af05f1754c429cec7df47dd28ea3edc7622d0b98e982468f3f532cfa45469090c9de0242abfba88efe306a15e28d40671d5d3f1878140ee5c8f3f5043264
+  metadata.gz: a838722e1824b05d66fca1fb0f3e99c56161fa50c87f7ec00e4116d90cb08f941f00731ff7275ea467450fa44cbf534cbd2688eb6fec08745c9f060086b15b01
+  data.tar.gz: e9526302bc214792ea285193bd4971b5f9775b05f84131be7f201bba0030b0c554bdb41836ea9f06fd8149d024ed69011f401e8d1cdb7e5c392bd5ea3fbfc6f7

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## [3.5.1](https://github.com/crowbar/crowbar-client/releases/tag/v3.5.1) - 2017-12-05
+
+* BUGFIX
+  * Escape reserved characters in credentials
+  * Fix for custom user and password for database subcommand
+  * Fix IP allocation subcommand (bsc#1069792)
+
 ## [3.5.0](https://github.com/crowbar/crowbar-client/releases/tag/v3.5.0) - 2017-10-13
 
 * ENHANCEMENT

data/lib/crowbar/client/command/database/connect.rb

@@ -28,8 +28,8 @@ module Crowbar
 
           def args_with_options
             args.easy_merge!(
-              username: options.db_username,
-              password: options.db_password,
+              db_username: options.db_username,
+              db_password: options.db_password,
               database: options.database,
               host: options.host,
               port: options.port

data/lib/crowbar/client/command/database/create.rb

@@ -28,8 +28,8 @@ module Crowbar
 
           def args_with_options
             args.easy_merge!(
-              username: options.db_username,
-              password: options.db_password
+              db_username: options.db_username,
+              db_password: options.db_password
             )
           end
 

data/lib/crowbar/client/command/database/test.rb

@@ -28,8 +28,8 @@ module Crowbar
 
           def args_with_options
             args.easy_merge!(
-              username: options.db_username,
-              password: options.db_password,
+              db_username: options.db_username,
+              db_password: options.db_password,
               database: options.database,
               host: options.host,
               port: options.port

data/lib/crowbar/client/request/host_ip/allocate.rb

@@ -34,7 +34,7 @@ module Crowbar
               name: attrs.node,
               network: attrs.network,
               range: attrs.range,
-              suggestion: attrs.suggest
+              suggestion: attrs.suggestion
             )
           end
 

data/lib/crowbar/client/request/rest.rb

@@ -35,8 +35,8 @@ module Crowbar
               "/",
               url
             ].join(""),
-            user: user,
-            password: password,
+            user: URI::DEFAULT_PARSER.escape(user, URI::PATTERN::RESERVED),
+            password: URI::DEFAULT_PARSER.escape(password, URI::PATTERN::RESERVED),
             auth_type: auth_type,
             verify_ssl: verify_ssl,
             timeout: Config.timeout

data/lib/crowbar/client/request/virtual_ip/allocate.rb

@@ -34,7 +34,7 @@ module Crowbar
               name: attrs.service,
               network: attrs.network,
               range: attrs.range,
-              suggestion: attrs.suggest
+              suggestion: attrs.suggestion
             )
           end
 

data/lib/crowbar/client/version.rb

@@ -33,7 +33,7 @@ module Crowbar
       #
       # Patch version
       #
-      PATCH = 0
+      PATCH = 1
 
       #
       # Optional suffix

data/spec/crowbar/client/request/host_ip/allocate_spec.rb

@@ -29,7 +29,7 @@ describe "Crowbar::Client::Request::HostIP::Allocate" do
         node: "",
         network: "",
         range: "",
-        suggest: "",
+        suggestion: "",
         proposal: "default"
       }
     end

data/spec/crowbar/client/request/rest_spec.rb

@@ -19,6 +19,58 @@ require_relative "../../../spec_helper"
 describe "Crowbar::Client::Request::Rest" do
   subject { ::Crowbar::Client::Request::Rest }
 
-  pending
+  context "with default parameters" do
+    before do
+      allow(Crowbar::Client::Config).to receive("server") { "testserver1" }
+      allow(Crowbar::Client::Config).to receive("username") { "testuser1" }
+      allow(Crowbar::Client::Config).to receive("password") { "testpassword1" }
+      allow(Crowbar::Client::Config).to receive("verify_ssl") { true }
+    end
+
+    let!(:instance) do
+      subject.new
+    end
+
+    it "uses root URL from global config" do
+      expect(instance.url).to(eq("testserver1/"))
+    end
+
+    it "uses user from global config" do
+      expect(instance.user).to(eq("testuser1"))
+    end
+
+    it "uses password from global config" do
+      expect(instance.password).to(eq("testpassword1"))
+    end
+
+    it "uses verify_ssl from global config" do
+      expect(instance.options[:verify_ssl]).to(eq(true))
+    end
+
+    it "uses digest auth_type" do
+      expect(instance.options[:auth_type]).to(eq(:digest))
+    end
+  end
+
+  context "with username/password including reserved characters" do
+    let!(:instance) do
+      subject.new(
+        user: "testuser;/?:@&=+$,[]",
+        password: "testpassword;/?:@&=+$,[]"
+      )
+    end
+
+    it "escapes the username" do
+      expect(instance.user).to(
+        eq("testuser%3B%2F%3F%3A%40%26%3D%2B%24%2C%5B%5D")
+      )
+    end
+
+    it "escapes the password" do
+      expect(instance.password).to(
+        eq("testpassword%3B%2F%3F%3A%40%26%3D%2B%24%2C%5B%5D")
+      )
+    end
+  end
 
 end

data/spec/crowbar/client/request/virtual_ip/allocate_spec.rb

@@ -29,7 +29,7 @@ describe "Crowbar::Client::Request::VirtualIP::Allocate" do
         service: "",
         network: "",
         range: "",
-        suggest: "",
+        suggestion: "",
         proposal: "default"
       }
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: crowbar-client
 version: !ruby/object:Gem::Version
-  version: 3.5.0
+  version: 3.5.1
 platform: ruby
 authors:
 - Thomas Boerger
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-13 00:00:00.000000000 Z
+date: 2017-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -621,7 +621,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Crowbar commandline client