github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-22 11:44:49 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Check that common passwords list is greater than 0

Browse Source
This commit is contained in:
Neil Lalonde 2013-12-30 14:25:50 -05:00
parent 8a1593bfd2
commit 47e1d00f96
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/common_passwords/common_passwords.rb
View File

@ -30,7 +30,7 @@ class CommonPasswords
def self.password_list
@mutex.synchronize do
load_passwords unless redis.exists(LIST_KEY)
load_passwords unless redis.scard(LIST_KEY) > 0
end
RedisPasswordList.new
end

16
spec/components/common_passwords/common_passwords_spec.rb
View File

@ -41,8 +41,9 @@ describe CommonPasswords do
it "loads the passwords file if redis doesn't have it" do
mock_redis = mock("redis")
mock_redis.stubs(:exists).returns(false)
mock_redis.stubs(:scard).returns(0)
described_class.stubs(:redis).returns(mock_redis)
described_class.expects(:load_passwords).returns([])
described_class.expects(:load_passwords).returns(['password'])
list = described_class.password_list
list.should respond_to(:include?)
end
@ -50,16 +51,27 @@ describe CommonPasswords do
it "doesn't load the passwords file if redis has it" do
mock_redis = mock("redis")
mock_redis.stubs(:exists).returns(true)
mock_redis.stubs(:scard).returns(5000)
described_class.stubs(:redis).returns(mock_redis)
described_class.expects(:load_passwords).never
list = described_class.password_list
list.should respond_to(:include?)
end
it "loads the passwords file if redis has an empty list" do
mock_redis = mock("redis")
mock_redis.stubs(:exists).returns(true)
mock_redis.stubs(:scard).returns(0)
described_class.stubs(:redis).returns(mock_redis)
described_class.expects(:load_passwords).returns(['password'])
list = described_class.password_list
list.should respond_to(:include?)
end
end
context "missing password file" do
it "tolerates it" do
described_class.stubs(:redis).returns(stub_everything(sismember: false))
described_class.stubs(:redis).returns(stub_everything(sismember: false, exists: false, scard: 0))
File.stubs(:readlines).with(described_class::PASSWORD_FILE).raises(Errno::ENOENT)
described_class.common_password?("password").should eq(false)
end