From f59706a4b1a309f6c3e614ded7cbd359335e7960 Mon Sep 17 00:00:00 2001
From: irregulator <irregulator@riseup.net>
Date: Wed, 21 May 2014 01:36:30 +0300
Subject: Add two macros, base32_secret and obfs_port, used in obfsproxy

---
 lib/leap_cli/config/macros.rb | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/lib/leap_cli/config/macros.rb b/lib/leap_cli/config/macros.rb
index c6938fe..241a2a4 100644
--- a/lib/leap_cli/config/macros.rb
+++ b/lib/leap_cli/config/macros.rb
@@ -6,6 +6,8 @@
 # This module is included in Config::Object
 #
 
+require 'base32'
+
 module LeapCli; module Config
   module Macros
     ##
@@ -130,6 +132,16 @@ module LeapCli; module Config
       @manager.secrets.set(name, Util::Secret.generate(length), @node[:environment])
     end
 
+    # inserts a base32 encoded secret
+    def base32_secret(name, length=20)
+      @manager.secrets.set(name, Base32.encode(Util::Secret.generate(length)), @node[:environment])
+    end
+
+    # Picks a random obfsproxy port from given range
+    def obfs_port(name, range)
+      @manager.secrets.set(name, rand(range), @node[:environment])
+    end
+
     #
     # inserts an hexidecimal secret string, generating it if needed.
     #
-- 
cgit v1.2.3


From 91f32c7261a4c1d5a8a2e00100fbc8ee577aa0ac Mon Sep 17 00:00:00 2001
From: irregulator <irregulator@riseup.net>
Date: Thu, 22 May 2014 03:48:32 +0300
Subject: Change macro name to rand_range, add base32 gem dependency

---
 leap_cli.gemspec              | 1 +
 lib/leap_cli/config/macros.rb | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/leap_cli.gemspec b/leap_cli.gemspec
index 829309a..d0b9a99 100644
--- a/leap_cli.gemspec
+++ b/leap_cli.gemspec
@@ -70,6 +70,7 @@ spec = Gem::Specification.new do |s|
   s.add_runtime_dependency('ya2yaml')    # pure ruby yaml, so we can better control output. see https://github.com/afunai/ya2yaml
   s.add_runtime_dependency('json_pure')  # pure ruby json, so we can better control output.
   s.add_runtime_dependency('versionomy') # compare version strings
+  s.add_runtime_dependency('base32')     # base32 encoding
 
   ##
   ## DEPENDENCIES for VENDORED GEMS
diff --git a/lib/leap_cli/config/macros.rb b/lib/leap_cli/config/macros.rb
index 241a2a4..b5dc3b8 100644
--- a/lib/leap_cli/config/macros.rb
+++ b/lib/leap_cli/config/macros.rb
@@ -138,7 +138,7 @@ module LeapCli; module Config
     end
 
     # Picks a random obfsproxy port from given range
-    def obfs_port(name, range)
+    def rand_range(name, range)
       @manager.secrets.set(name, rand(range), @node[:environment])
     end
 
-- 
cgit v1.2.3