Merge pull request #5 from timogoebel/cleanup

code cleanups

Author: martencassel

Gemfile.lock

@@ -1,4 +1,3 @@
-
 require 'rake'
 require 'rake/testtask'
 
@@ -12,4 +11,4 @@ Rake::TestTask.new(:test) do |t|
   t.libs << 'test'
   t.test_files = FileList['test/**/*_test.rb']
   t.verbose = true
-end
+end

Rakefile

@@ -1,20 +1,20 @@
 module Proxy::AdRealm
-    class ConfigurationLoader
-        def load_classes
-            require 'smart_proxy_realm_ad/provider'
-        end
+  class ConfigurationLoader
+    def load_classes
+      require 'smart_proxy_realm_ad/provider'
+    end
 
-        def load_dependency_injection_wirings(container_instance, settings)
-            container_instance.dependency:realm_provider_impl,
-                lambda {
-                    ::Proxy::AdRealm::Provider.new(
-                        settings[:realm],
-                        settings[:keytab_path],
-                        settings[:principal],
-                        settings[:domain_controller],
-                        settings[:ou]
-                    )
-                }
-        end
+    def load_dependency_injection_wirings(container_instance, settings)
+      container_instance.dependency :realm_provider_impl,
+                                    lambda {
+                                      ::Proxy::AdRealm::Provider.new(
+                                        settings[:realm],
+                                        settings[:keytab_path],
+                                        settings[:principal],
+                                        settings[:domain_controller],
+                                        settings[:ou]
+                                      )
+                                    }
     end
+  end
 end

lib/smart_proxy_realm_ad/configuration_loader.rb

@@ -1,12 +1,12 @@
 require 'smart_proxy_realm_ad/version'
 
 module Proxy::AdRealm
-    class Plugin < Proxy::Provider
-        load_classes ::Proxy::AdRealm::ConfigurationLoader
-        load_dependency_injection_wirings ::Proxy::AdRealm::ConfigurationLoader
+  class Plugin < Proxy::Provider
+    load_classes ::Proxy::AdRealm::ConfigurationLoader
+    load_dependency_injection_wirings ::Proxy::AdRealm::ConfigurationLoader
 
-        validate_presence :realm, :keytab_path, :principal, :domain_controller
+    validate_presence :realm, :keytab_path, :principal, :domain_controller
 
-        plugin :realm_ad, ::Proxy::AdRealm::VERSION
-    end
-end
+    plugin :realm_ad, ::Proxy::AdRealm::VERSION
+  end
+end

lib/smart_proxy_realm_ad/plugin.rb

@@ -3,121 +3,114 @@
 require 'passgen'
 
 module Proxy::AdRealm
-    class Provider
-        include Proxy::Log
-        include Proxy::Util
-        include Proxy::Kerberos
-
-        def initialize(realm, keytab_path, principal, domain_controller, ou)
-            @realm = realm
-            @keytab_path = keytab_path
-            @principal = principal
-            @domain_controller = domain_controller
-            @domain = realm.downcase
-            @ou = ou
-            logger.info "Proxy::AdRealm: initialize... #{@realm}, #{@keytab_path}, #{@principal}, #{@domain_controller}, #{@domain}, #{ou}"
-        end
-
-        def check_realm realm
-            raise Exception.new "Unknown realm #{realm}" unless realm.casecmp(@realm).zero?
-        end
-
-        def find hostfqdn
-            true
-        end
-
-        def create realm, hostfqdn, params
-            logger.info "Proxy::AdRealm: create... #{realm}, #{hostfqdn}, #{params}"
-            check_realm realm
-            kinit_radcli_connect
-
-            password = generate_password
-            result = { :randompassword => password }
-
-            if params[:rebuild] == "true"
-              do_host_rebuild hostfqdn, password
-            else
-              do_host_create hostfqdn, password
-            end
-
-            JSON.pretty_generate(result)
-        end
-
-        def delete realm, hostfqdn
-            logger.info "Proxy::AdRealm: delete... #{realm}, #{hostfqdn}"
-            kinit_radcli_connect
-            check_realm realm
-            radcli_delete hostfqdn
-        end
-
-        private
-
-        def hostfqdn_to_hostname host_fqdn
-            begin
-              host_fqdn_split = host_fqdn.split('.')
-              host_fqdn_split[0]
-            rescue => e
-              logger.debug "hostfqdn_to_hostname error: #{e}"
-              raise e
-            end
-        end
-
-        def do_host_create hostfqdn, password
-            hostname = hostfqdn_to_hostname hostfqdn
-            radcli_join hostfqdn, hostname, password
-        end
-
-        def do_host_rebuild hostfqdn, password
-            hostname = hostfqdn_to_hostname hostfqdn
-            radcli_password hostname, password
-
-        end
-
-        def kinit_radcli_connect
-            init_krb5_ccache @keytab_path, @principal
-            @adconn = radcli_connect()
-        end
-
-        def radcli_connect
-            # Connect to active directory
-            conn = Adcli::AdConn.new(@domain)
-            conn.set_domain_realm(@realm)
-            conn.set_domain_controller(@domain_controller)
-            conn.set_login_ccache_name("")
-            conn.connect()
-            return conn
-        end
-
-        def radcli_join hostfqdn, hostname, password
-            # Join computer
-            enroll = Adcli::AdEnroll.new(@adconn)
-            enroll.set_computer_name(hostname)
-            enroll.set_host_fqdn(hostfqdn)
-            enroll.set_domain_ou(@ou) if @ou
-            enroll.set_computer_password(password)
-            enroll.join()
-        end
-
-        def generate_password
-            Passgen::generate(:length => 20)
-        end
-
-        def radcli_password hostname, password
-            # Reset a computer's password
-            enroll = Adcli::AdEnroll.new(@adconn)
-            enroll.set_computer_name(hostname)
-            enroll.set_domain_ou(@ou) if @ou
-            enroll.set_computer_password(password)
-            enroll.password()
-        end
-
-        def radcli_delete hostname
-            # Delete a computer's account
-            enroll = Adcli::AdEnroll.new(@adconn)
-            enroll.set_computer_name(hostname)
-            enroll.set_domain_ou(@ou) if @ou
-            enroll.delete()
-        end
+  class Provider
+    include Proxy::Log
+    include Proxy::Util
+    include Proxy::Kerberos
+
+    def initialize(realm, keytab_path, principal, domain_controller, ou)
+      @realm = realm
+      @keytab_path = keytab_path
+      @principal = principal
+      @domain_controller = domain_controller
+      @domain = realm.downcase
+      @ou = ou
+      logger.info "Proxy::AdRealm: initialize... #{@realm}, #{@keytab_path}, #{@principal}, #{@domain_controller}, #{@domain}, #{@ou}"
+    end
+
+    def check_realm(realm)
+      raise Exception, "Unknown realm #{realm}" unless realm.casecmp(@realm).zero?
+    end
+
+    def find(_hostfqdn)
+      true
+    end
+
+    def create(realm, hostfqdn, params)
+      logger.info "Proxy::AdRealm: create... #{realm}, #{hostfqdn}, #{params}"
+      check_realm(realm)
+      kinit_radcli_connect
+
+      password = generate_password
+      result = { randompassword: password }
+
+      if params[:rebuild] == 'true'
+        do_host_rebuild(hostfqdn, password)
+      else
+        do_host_create(hostfqdn, password)
+      end
+
+      JSON.pretty_generate(result)
+    end
+
+    def delete(realm, hostfqdn)
+      logger.info "Proxy::AdRealm: delete... #{realm}, #{hostfqdn}"
+      kinit_radcli_connect
+      check_realm(realm)
+      radcli_delete(hostfqdn)
+    end
+
+    private
+
+    def hostfqdn_to_hostname(host_fqdn)
+      host_fqdn_split = host_fqdn.split('.')
+      host_fqdn_split.first
+    end
+
+    def do_host_create(hostfqdn, password)
+      hostname = hostfqdn_to_hostname(hostfqdn)
+      radcli_join(hostfqdn, hostname, password)
+    end
+
+    def do_host_rebuild(hostfqdn, password)
+      hostname = hostfqdn_to_hostname hostfqdn
+      radcli_password(hostname, password)
+    end
+
+    def kinit_radcli_connect
+      init_krb5_ccache(@keytab_path, @principal)
+      @adconn = radcli_connect
+    end
+
+    def radcli_connect
+      # Connect to active directory
+      conn = Adcli::AdConn.new(@domain)
+      conn.set_domain_realm(@realm)
+      conn.set_domain_controller(@domain_controller)
+      conn.set_login_ccache_name('')
+      conn.connect
+      conn
+    end
+
+    def radcli_join(hostfqdn, hostname, password)
+      # Join computer
+      enroll = Adcli::AdEnroll.new(@adconn)
+      enroll.set_computer_name(hostname)
+      enroll.set_host_fqdn(hostfqdn)
+      enroll.set_domain_ou(@ou) if @ou
+      enroll.set_computer_password(password)
+      enroll.join
+    end
+
+    def generate_password
+      Passgen.generate(:length => 20)
+    end
+
+    def radcli_password(hostname, password)
+      # Reset a computer's password
+      enroll = Adcli::AdEnroll.new(@adconn)
+      enroll.set_computer_name(hostname)
+      enroll.set_domain_ou(@ou) if @ou
+      enroll.set_computer_password(password)
+      enroll.password
+    end
 
+    def radcli_delete(hostname)
+      # Delete a computer's account
+      enroll = Adcli::AdEnroll.new(@adconn)
+      enroll.set_computer_name(hostname)
+      enroll.set_domain_ou(@ou) if @ou
+      enroll.delete
     end
+  end
 end

lib/smart_proxy_realm_ad/provider.rb

@@ -1,5 +1,5 @@
 module Proxy
   module AdRealm
-    VERSION = '0.1'
+    VERSION = '0.1'.freeze
   end
-end
+end