2 files changed, 41 insertions, 19 deletions
diff --git a/users/app/models/user.rb b/users/app/models/user.rb
index a6aab84..1afb9db 100644
--- a/users/app/models/user.rb
+++ b/users/app/models/user.rb
@@ -5,8 +5,19 @@ class User < CouchRest::Model::Base
   property :password_verifier, String, :accessible => true
   property :password_salt, String, :accessible => true
 
-  validates :login, :password_salt, :password_verifier, :presence => true
-  validates :login, :uniqueness => true
+  validates :login, :password_salt, :password_verifier,
+    :presence => true
+
+  validates :login,
+    :uniqueness => true
+
+  validates :login,
+    :format => { :with => /\A[A-Za-z\d_]+\z/,
+      :message => "Only letters, digits and _ allowed" }
+
+  validates :password_salt, :password_verifier,
+    :format => { :with => /\A[\dA-Fa-f]+\z/,
+      :message => "Only hex numbers allowed" }
 
   timestamps!
 
@@ -22,8 +33,8 @@ class User < CouchRest::Model::Base
     # valid set of attributes for testing
     def valid_attributes_hash
       { :login => "me",
-        :password_verifier => "1234",
-        :password_salt => "4321" }
+        :password_verifier => "1234ABC",
+        :password_salt => "4321AB" }
     end
 
   end
diff --git a/users/test/unit/user_test.rb b/users/test/unit/user_test.rb
index 870d422..822ef33 100644
--- a/users/test/unit/user_test.rb
+++ b/users/test/unit/user_test.rb
@@ -3,37 +3,48 @@ require 'test_helper'
 class UserTest < ActiveSupport::TestCase
 
   include SRP::Util
+  setup do
+    @attribs = User.valid_attributes_hash
+    @user = User.new(@attribs)
+  end
+
   test "test set of attributes should be valid" do
-    user = User.new(User.valid_attributes_hash)
-    assert user.valid?
+    @user.valid?
+    assert_equal Hash.new, @user.errors.messages
+  end
+
+  test "test require hex for password_verifier" do
+    @user.password_verifier = "QWER"
+    assert !@user.valid?
+  end
+
+  test "test require alphanumerical for login" do
+    @user.login = "qwär"
+    assert !@user.valid?
   end
 
   test "find_by_param gets User by login" do
-    user = User.create!(User.valid_attributes_hash)
-    assert_equal user, User.find_by_param(user.login)
-    user.destroy
+    @user.save
+    assert_equal @user, User.find_by_param(@user.login)
+    @user.destroy
   end
 
   test "to_param gives user login" do
-    user = User.new(User.valid_attributes_hash)
-    assert_equal user.login, user.to_param
+    assert_equal @user.login, @user.to_param
   end
 
   test "verifier returns number for the hex in password_verifier" do
-    user = User.new(User.valid_attributes_hash)
-    assert_equal user.password_verifier.hex, user.verifier
+    assert_equal @user.password_verifier.hex, @user.verifier
   end
 
   test "salt returns number for the hex in password_salt" do
-    user = User.new(User.valid_attributes_hash)
-    assert_equal user.password_salt.hex, user.salt
+    assert_equal @user.password_salt.hex, @user.salt
   end
 
-  test "should include SRP::Authentication" do
+  test "should include SRP" do
     client_rnd = bigrand(32).hex
-    user = User.new(User.valid_attributes_hash)
-    srp_session = user.initialize_auth(client_rnd)
-    assert srp_session.is_a? SRP::Authentication::Session
+    srp_session = @user.initialize_auth(client_rnd)
+    assert srp_session.is_a? SRP::Session
     assert_equal client_rnd, srp_session.aa
   end