rct 0.5 → 0.6

Sign up to get free protection for your applications and to get access to all the features.
@@ -1,5 +1,5 @@
1
1
  #
2
- # Copyright 2012-2013 Jyri J. Virkki <jyri@virkki.com>
2
+ # Copyright 2012-2014 Jyri J. Virkki <jyri@virkki.com>
3
3
  #
4
4
  # This file is part of rct.
5
5
  #
@@ -90,7 +90,7 @@ class RCT
90
90
  # define global options (from parse_global_options) so can do error chacking
91
91
  $GLOBAL_OPTS = {
92
92
  '-t' => 1, '--test' => 1, '--req' => 1, '-h' => 1, '--host' => 1,
93
- '-p' => 1, '--port' => 1, '-v' => 1
93
+ '-p' => 1, '--port' => 1, '-v' => 1, '--cafile' => 1
94
94
  }
95
95
 
96
96
  def self.parse_global_options
@@ -116,6 +116,9 @@ class RCT
116
116
  elsif (arg == '-p' || arg == '--port')
117
117
  sset(SERVER_PORT, argv_get(pos))
118
118
 
119
+ elsif (arg == '--cafile')
120
+ sset(SSL_CA_FILE, argv_get(pos))
121
+
119
122
  elsif (arg == '-v')
120
123
  increase_log_level()
121
124
  ARGV.delete_at(pos)
@@ -1,5 +1,5 @@
1
1
  #
2
- # Copyright 2012-2013 Jyri J. Virkki <jyri@virkki.com>
2
+ # Copyright 2012-2014 Jyri J. Virkki <jyri@virkki.com>
3
3
  #
4
4
  # This file is part of rct.
5
5
  #
@@ -17,7 +17,7 @@
17
17
  # along with rct. If not, see <http://www.gnu.org/licenses/>.
18
18
  #
19
19
 
20
- RCT_VERSION = '0.5'
20
+ RCT_VERSION = '0.6'
21
21
 
22
22
  RCT_MODE = '_mode'
23
23
  RCT_MODE_CLI = 'cli'
@@ -41,6 +41,8 @@ REQ_AUTH_TYPE_BASIC = 'basic'
41
41
  REQ_AUTH_NAME = '_req_auth_name'
42
42
  REQ_AUTH_PWD = '_req_auth_pwd'
43
43
 
44
+ SSL_CA_FILE = '_ca_file'
45
+
44
46
  RESULT = 1
45
47
  INFO = 2
46
48
  DEBUG = 3
@@ -1,5 +1,5 @@
1
1
  #
2
- # Copyright 2012-2013 Jyri J. Virkki <jyri@virkki.com>
2
+ # Copyright 2012-2014 Jyri J. Virkki <jyri@virkki.com>
3
3
  #
4
4
  # This file is part of rct.
5
5
  #
@@ -57,6 +57,7 @@ class RCTHTTP
57
57
  # * REQ_METHOD - HTTP method to use (if not set, default is GET)
58
58
  # * REQ_HEADERS - Optional hash of additional request headers to set.
59
59
  # * REQ_BODY - Optional request body.
60
+ # * SSL_CA_FILE - Override default trusted CA file for https.
60
61
  #
61
62
  # Always returns an rct Response object.
62
63
  #
@@ -73,6 +74,12 @@ class RCTHTTP
73
74
  die("server protocol missing!")
74
75
  end
75
76
 
77
+ cafile = RCT.sget(SSL_CA_FILE)
78
+ if (cafile != nil)
79
+ @http_client.ssl_config.set_trust_ca(cafile)
80
+ RCT.log(INFO, "CA trust file set to #{cafile}")
81
+ end
82
+
76
83
  if (host == nil)
77
84
  die("server hostname missing!")
78
85
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: rct
3
3
  version: !ruby/object:Gem::Version
4
- version: '0.5'
4
+ version: '0.6'
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2013-12-28 00:00:00.000000000 Z
12
+ date: 2014-10-17 00:00:00.000000000 Z
13
13
  dependencies: []
14
14
  description: wip
15
15
  email: jyri@virkki.com