Add two macros, base32_secret and obfs_port, used in obfsproxy

diff --git a/lib/leap_cli/config/macros.rb b/lib/leap_cli/config/macros.rb
index c6938fe71515f7d43a723e02634ec58e60496893..241a2a479f130f7100d52ae096fefe67f515d021 100644 (file)
--- 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.
     #