pipe2me-client 0.2.13 → 0.2.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ea9b39bdabfdff554182252c3a14f48dfb723e56
-  data.tar.gz: 4f7804c87900d6efe3539cf05affd4fb50560da5
+  metadata.gz: 7a4b518abcbe271bfd874a2368379ee307ea45bd
+  data.tar.gz: f89e443fb7f8741d923924c5852f66a20fd94769
 SHA512:
-  metadata.gz: 531290a0666f54693bab6d48c15bafe070064bd9a275fec8570600a24571357753dc788c788f8b7c98970153ff04b79fd0718d9e7f083f3a9d8e53a10a2256bc
-  data.tar.gz: 441b9f251e8fe932f3795ee482c35693c4c991cc1404a55655e4454b005d34b39c7ce4404d82b4a0293175bfa89faaea4635eaee946c46e5a9d489cd308e6030
+  metadata.gz: 594ebe9414dc36d0b2fb82636da00f481c74c211a8e90c36b0e17353e21b63cd4c4f3976eb2df45ddad48ce37a2f15748e3c5806454af9a2c9e1a2a4e2db07b2
+  data.tar.gz: a2378307eea92fb07c01c21b409629d82b390104c9f710b3fe838b0f9e2355bb92051a2bd5e3fc8657966d07bb45d64434a5774ade2c2901633a9787f7f785f2

data/lib/pipe2me/version.rb

@@ -1,4 +1,4 @@
 module Pipe2me
-  VERSION = "0.2.13"
+  VERSION = "0.2.14"
   BANNER = "pipe2me command line client V#{Pipe2me::VERSION}; (c) The kinko team, 2013, 2014."
 end

data/rakelib/test.rake

@@ -1,8 +1,17 @@
 task :test => "test:debug"
 namespace :test do
-  # run a debug test - a test against pipe2.dev. This is the default
-  # test scenario.
+  # run a debug test against pipe2.dev. This is the default test scenario.
+  #
+  # pipe2.dev, which should  point to 127.0.0.1, should run a development 
+  # version of the pipe2me server package.
   task :debug do
+    require "simple/ui"
+    require_relative "../lib/pipe2me/ext/sys"
+    unless Pipe2me::Sys.sys :bash, "-c", "curl -O /dev/null http://pipe2.dev:8080 2> /dev/null"
+      UI.error "Could not find test pipe2me test server on http://pipe2.dev:8080"
+      exit 1
+    end
+
     FileUtils.mkdir_p "tmp"
     system "TEST_ENV=debug sbin/roundup test/*-test.sh"
   end

data/test/env-test.sh

@@ -1,5 +1,9 @@
 #!/usr/bin/env roundup
-describe "show pipe2me environment"
+describe "pipe2me environment tests"
+
+#
+# This tests check that the environment is setup properly.
+# Note: the environment is generated via "pipe2me env"
 
 . $(dirname $1)/testhelper.inc
 

data/test/redirection-test.sh

@@ -21,3 +21,37 @@ it_redirects_http_and_https_connections() {
   http_redirection_target=$(curl -s -o /dev/null -I -w %{redirect_url} http://$fqdn:8080)
   [ $PIPE2ME_URLS_0/ = "$http_redirection_target" ]
 }
+
+it_redirects_http_to_https_if_needed() {
+  # later 'redirects https://subdomain.$pipe2me_server to https://subdomain.$pipe2me_server:port'
+  fqdn=$($pipe2me setup --server $pipe2me_server --token $pipe2me_token --ports 8100 --protocols https)
+  
+  # load pipe2me environment settings. As a result, ..
+  eval $($pipe2me env)
+  
+  [[ "$PIPE2ME_URLS_0" ]]           # .. PIPE2ME_URLS_0 is the HTTPS redirection target URL, and ..
+  [[ -z "$PIPE2ME_URLS_1" ]]        # .. PIPE2ME_URLS_1 is the HTTPS redirection target URL
+
+  https_redirection_target=$(curl -s -o /dev/null -I -k -w %{redirect_url} https://$fqdn:8443)
+  [ $PIPE2ME_URLS_0/ = "$https_redirection_target" ]
+
+  http_redirection_target=$(curl -s -o /dev/null -I -w %{redirect_url} http://$fqdn:8080)
+  [ $PIPE2ME_URLS_0/ = "$http_redirection_target" ]
+}
+
+it_does_not_redirects_https_to_http() {
+  # later 'redirects https://subdomain.$pipe2me_server to https://subdomain.$pipe2me_server:port'
+  fqdn=$($pipe2me setup --server $pipe2me_server --token $pipe2me_token --ports 8100 --protocols http)
+  
+  # load pipe2me environment settings. As a result, ..
+  eval $($pipe2me env)
+  
+  [[ "$PIPE2ME_URLS_0" ]]           # .. PIPE2ME_URLS_0 is the HTTPS redirection target URL, and ..
+  [[ -z "$PIPE2ME_URLS_1" ]]        # .. PIPE2ME_URLS_1 is the HTTPS redirection target URL
+
+  https_redirection_target=$(curl -s -o /dev/null -I -k -w %{redirect_url} https://$fqdn:8443)
+  [[ -z "$https_redirection_target" ]]
+
+  http_redirection_target=$(curl -s -o /dev/null -I -w %{redirect_url} http://$fqdn:8080)
+  [[ $PIPE2ME_URLS_0/ = "$http_redirection_target" ]]
+}

data/test/{opensslkey-test.sh → ssl-test.sh}

@@ -1,25 +1,28 @@
 #!/usr/bin/env roundup
-describe "openssl tests"
+describe "SSL tests"
+
+# This file contains tests related to SSL functionality.
+# 
 
 . $(dirname $1)/testhelper.inc
 
 # setup creates and signs openssl credentials
-it_sets_up_openssl_certs() {
+it_sets_up_ssl_certs() {
+  # setup the pipe2me client. This must create a private key and a server
+  # certificate, amongst other things. The certificate must contain the
+  # correct name.
+  
+
   fqdn=$($pipe2me setup --server $pipe2me_server --token $pipe2me_token)
+
+  # test for private key
   test -f pipe2me.openssl.priv
   cat pipe2me.openssl.priv | grep -E "BEGIN.*PRIVATE KEY"
 
+  # test for certificate
   test -f pipe2me.openssl.cert
   cat pipe2me.openssl.cert | grep "BEGIN CERTIFICATE"
 
-  # verify cert name
+  # verify name in certificate
   openssl x509 -in pipe2me.openssl.cert  -text | grep CN=$fqdn
 }
-
-it_cannot_sign_other_certs() {
-  later A certificate cannot be used to sign other certificates
-}
-
-it_cannot_sign_fake_certs() {
-  later A client cannot ask the server to sign certs with different names
-}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pipe2me-client
 version: !ruby/object:Gem::Version
-  version: 0.2.13
+  version: 0.2.14
 platform: ruby
 authors:
 - radiospiel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-15 00:00:00.000000000 Z
+date: 2014-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -66,7 +66,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: pipe2me command line client V0.2.13; (c) The kinko team, 2013, 2014.
+description: pipe2me command line client V0.2.14; (c) The kinko team, 2013, 2014.
 email: contact@kinko.me
 executables:
 - pipe2me
@@ -102,10 +102,10 @@ files:
 - test/env-test.sh
 - test/foreman-test.sh
 - test/monitrc-test.sh
-- test/opensslkey-test.sh
 - test/redirection-test.sh
 - test/setup-test.sh
 - test/sshkey-test.sh
+- test/ssl-test.sh
 - test/testhelper.debug
 - test/testhelper.inc
 - test/testhelper.release
@@ -133,5 +133,5 @@ rubyforge_project:
 rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: pipe2me command line client V0.2.13; (c) The kinko team, 2013, 2014.
+summary: pipe2me command line client V0.2.14; (c) The kinko team, 2013, 2014.
 test_files: []