Skip to content

Commit 74f5702

Browse files
committed
remove passgen dependency
1 parent e3e9a42 commit 74f5702

6 files changed

+18
-89
lines changed

Gemfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ source 'https://rubygems.org'
22
gemspec
33

44
group :development do
5-
gem 'smart_proxy', :github => 'theforeman/smart-proxy', :branch => 'develop'
6-
end
5+
gem 'smart_proxy', :git => 'https://github.com/theforeman/smart-proxy.git', :branch => 'develop'
6+
end

extra/redhat/rubygem-passgen-1.0.2.spec

-69
This file was deleted.

extra/redhat/rubygem-smart_proxy_realm_ad_plugin-0.1.spec

-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ Requires: foreman-proxy >= 1.15
1717
Requires: ruby(release)
1818
Requires: ruby
1919
Requires: ruby(rubygems)
20-
Requires: rubygem(passgen)
2120
Requires: rubygem(rkerberos)
2221
Requires: rubygem(radcli)
2322
BuildRequires: ruby(release)

lib/smart_proxy_realm_ad/provider.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
require 'proxy/kerberos'
22
require 'radcli'
3-
require 'passgen'
43

54
module Proxy::AdRealm
65
class Provider
@@ -93,7 +92,8 @@ def radcli_join(hostfqdn, hostname, password)
9392
end
9493

9594
def generate_password
96-
Passgen.generate(:length => 20)
95+
characters = ('A'..'Z').to_a + ('a'..'z').to_a + (0..9).to_a
96+
Array.new(20) { characters.sample }.join
9797
end
9898

9999
def radcli_password(hostname, password)

smart_proxy_realm_ad_plugin.gemspec

-1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,5 @@ Gem::Specification.new do |s|
2020
s.add_development_dependency('mocha')
2121
s.add_development_dependency('test-unit')
2222
s.add_dependency('rkerberos')
23-
s.add_dependency('passgen')
2423
s.add_dependency('radcli')
2524
end

test/ad_provider_test.rb

+14-14
Original file line numberDiff line numberDiff line change
@@ -6,56 +6,56 @@
66
class RealmAdTest < Test::Unit::TestCase
77
def setup
88
@realm = 'test_realm'
9-
@provider = Proxy::AdRealm::Provider.new('example.com', 'keytab_path', 'principal', 'domain-controller')
9+
@provider = Proxy::AdRealm::Provider.new('example.com', 'keytab_path', 'principal', 'domain-controller', nil)
1010
end
1111

1212
def test_create_host
1313
hostname = 'host.example.com'
14-
password = 'a_password'
1514
params = {}
16-
params[:rebuild] = "false"
15+
params[:rebuild] = 'false'
1716
@provider.expects(:check_realm).with(@realm)
1817
@provider.expects(:kinit_radcli_connect)
19-
@provider.expects(:generate_password).returns(password)
2018
@provider.expects(:radcli_join)
21-
@provider.create(@realm, hostname, params)
19+
response = JSON.parse(@provider.create(@realm, hostname, params))
20+
assert_kind_of String, response['randompassword']
21+
assert_equal 20, response['randompassword'].size
2222
end
2323

2424
def test_create_with_unrecognized_realm_raises_exception
25-
assert_raises(Exception) { @provider.create('unknown_realm', 'a_host', {})}
25+
assert_raises(Exception) { @provider.create('unknown_realm', 'a_host', {}) }
2626
end
2727

2828
def test_create_rebuild
2929
hostname = 'host.example.com'
30-
password = 'a_password'
3130
params = {}
32-
params[:rebuild] = "true"
31+
params[:rebuild] = 'true'
3332
@provider.expects(:check_realm).with(@realm)
3433
@provider.expects(:kinit_radcli_connect)
35-
@provider.expects(:generate_password).returns(password)
3634
@provider.expects(:radcli_password)
37-
@provider.create(@realm, hostname, params)
35+
response = JSON.parse(@provider.create(@realm, hostname, params))
36+
assert_kind_of String, response['randompassword']
37+
assert_equal 20, response['randompassword'].size
3838
end
3939

4040
def test_rebuild_with_unrecognized_realm_raises_exception
4141
params = {}
42-
params[:rebuild] = "true"
42+
params[:rebuild] = 'true'
4343
assert_raises(Exception) { @provider.create('unknown_realm', 'a_host', params) }
4444
end
4545

4646
def test_find
4747
assert_true @provider.find('a_host_fqdn')
4848
end
4949

50-
def test_delete
50+
def test_delete
5151
@provider.expects(:check_realm).with(@realm)
5252
@provider.expects(:kinit_radcli_connect)
5353
@provider.expects(:radcli_delete)
5454
@provider.delete(@realm, 'a_host')
5555
end
56-
56+
5757
def test_delete_unrecognized_realm_raises_exception
5858
@provider.expects(:kinit_radcli_connect)
5959
assert_raises(Exception) { @provider.delete('unkown_realm', 'a_host') }
6060
end
61-
end
61+
end

0 commit comments

Comments
 (0)