normalize userCtx name and roles, also, no log in via a conflict doc

git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@900275 13f79535-47bb-0310-9956-ffa450edef68

4 files changed, 68 insertions, 40 deletions

diff --git a/share/www/script/test/cookie_auth.js b/share/www/script/test/cookie_auth.js
index 125a6dcb..68ec882d 100644
--- a/share/www/script/test/cookie_auth.js
+++ b/share/www/script/test/cookie_auth.js
@@ -46,22 +46,22 @@ couchTests.cookie_auth = function(debug) {
 
       // Create a user
       var jasonUserDoc = CouchDB.prepareUserDoc({
-        username: "Jason Davies",
+        name: "Jason Davies",
         roles: ["dev"]
       }, password);
       T(usersDb.save(jasonUserDoc).ok);      
       
       var checkDoc = usersDb.open(jasonUserDoc._id);
-      T(checkDoc.username == "Jason Davies");
+      T(checkDoc.name == "Jason Davies");
       
       var jchrisUserDoc = CouchDB.prepareUserDoc({
-        username: "jchris@apache.org"
+        name: "jchris@apache.org"
       }, "funnybone");
       T(usersDb.save(jchrisUserDoc).ok);
 
       // make sure we cant create duplicate users
       var duplicateJchrisDoc = CouchDB.prepareUserDoc({
-        username: "jchris@apache.org"
+        name: "jchris@apache.org"
       }, "eh, Boo-Boo?");
 
       try {
@@ -72,9 +72,9 @@ couchTests.cookie_auth = function(debug) {
         T(usersDb.last_req.status == 409);
       }
       
-      // we can't create _usernames
+      // we can't create _names
       var underscoreUserDoc = CouchDB.prepareUserDoc({
-        username: "_why"
+        name: "_why"
       }, "copperfield");
 
       try {
@@ -87,7 +87,7 @@ couchTests.cookie_auth = function(debug) {
       
       // we can't create docs with malformed ids
       var badIdDoc = CouchDB.prepareUserDoc({
-        username: "foo"
+        name: "foo"
       }, "bar");
       
       badIdDoc._id = "org.apache.couchdb:w00x";
@@ -102,12 +102,12 @@ couchTests.cookie_auth = function(debug) {
       
       // login works
       T(CouchDB.login('Jason Davies', password).ok);
-      T(CouchDB.session().name == 'Jason Davies');
+      T(CouchDB.session().userCtx.name == 'Jason Davies');
       
       // update one's own credentials document
       jasonUserDoc.foo=2;
       T(usersDb.save(jasonUserDoc).ok);
-      T(CouchDB.session().roles.indexOf("_admin") == -1);
+      T(CouchDB.session().userCtx.roles.indexOf("_admin") == -1);
       // can't delete another users doc unless you are admin
       try {
         usersDb.deleteDoc(jchrisUserDoc);
@@ -122,12 +122,12 @@ couchTests.cookie_auth = function(debug) {
        T(!CouchDB.login('Robert Allen Zimmerman', 'd00d').ok);
 
        // a failed login attempt should log you out
-       T(CouchDB.session().name != 'Jason Davies');
+       T(CouchDB.session().userCtx.name != 'Jason Davies');
 
        // test redirect
        xhr = CouchDB.request("POST", "/_session?next=/", {
          headers: {"Content-Type": "application/x-www-form-urlencoded"},
-         body: "username=Jason%20Davies&password="+encodeURIComponent(password)
+         body: "name=Jason%20Davies&password="+encodeURIComponent(password)
        });
        // should this be a redirect code instead of 200?
        // The cURL adapter is returning the expected 302 here.
@@ -145,8 +145,8 @@ couchTests.cookie_auth = function(debug) {
       // 
       // test that you can't update docs unless you are logged in as the user (or are admin)
       T(CouchDB.login("jchris@apache.org", "funnybone").ok);
-      T(CouchDB.session().name == "jchris@apache.org");
-      T(CouchDB.session().roles.length == 0);
+      T(CouchDB.session().userCtx.name == "jchris@apache.org");
+      T(CouchDB.session().userCtx.roles.length == 0);
       
       jasonUserDoc.foo=3;
 
@@ -170,7 +170,7 @@ couchTests.cookie_auth = function(debug) {
       }
       
       T(CouchDB.logout().ok);
-      T(CouchDB.session().roles[0] == "_admin");      
+      T(CouchDB.session().userCtx.roles[0] == "_admin");      
 
       jchrisUserDoc.foo = ["foo"];
       T(usersDb.save(jchrisUserDoc).ok);
@@ -188,24 +188,24 @@ couchTests.cookie_auth = function(debug) {
       
       // make sure the foo role has been applied
       T(CouchDB.login("jchris@apache.org", "funnybone").ok);
-      T(CouchDB.session().name == "jchris@apache.org");
-      T(CouchDB.session().roles.indexOf("_admin") == -1);
-      T(CouchDB.session().roles.indexOf("foo") != -1);
+      T(CouchDB.session().userCtx.name == "jchris@apache.org");
+      T(CouchDB.session().userCtx.roles.indexOf("_admin") == -1);
+      T(CouchDB.session().userCtx.roles.indexOf("foo") != -1);
       
       // now let's make jchris a server admin
       T(CouchDB.logout().ok);
-      T(CouchDB.session().roles[0] == "_admin");
-      T(CouchDB.session().name == null);
+      T(CouchDB.session().userCtx.roles[0] == "_admin");
+      T(CouchDB.session().userCtx.name == null);
       
       // set the -hashed- password so the salt matches
       // todo ask on the ML about this
       run_on_modified_server([{section: "admins",
         key: "jchris@apache.org", value: "funnybone"}], function() {
           T(CouchDB.login("jchris@apache.org", "funnybone").ok);
-          T(CouchDB.session().name == "jchris@apache.org");
-          T(CouchDB.session().roles.indexOf("_admin") != -1);
+          T(CouchDB.session().userCtx.name == "jchris@apache.org");
+          T(CouchDB.session().userCtx.roles.indexOf("_admin") != -1);
           // test that jchris still has the foo role
-          T(CouchDB.session().roles.indexOf("foo") != -1);
+          T(CouchDB.session().userCtx.roles.indexOf("foo") != -1);
 
           // should work even when user doc has no password
           jchrisUserDoc = usersDb.open(jchrisUserDoc._id);
@@ -215,13 +215,13 @@ couchTests.cookie_auth = function(debug) {
           T(CouchDB.logout().ok);
           T(CouchDB.login("jchris@apache.org", "funnybone").ok);
           var s = CouchDB.session();
-          T(s.name == "jchris@apache.org");
-          T(s.roles.indexOf("_admin") != -1);
+          T(s.userCtx.name == "jchris@apache.org");
+          T(s.userCtx.roles.indexOf("_admin") != -1);
           // test session info
-          T(s.info.authenticated == "{couch_httpd_auth, cookie_authentication_handler}");
-          T(s.info.user_db == "test_suite_users");
+          T(s.info.authenticated == "cookie");
+          T(s.info.authentication_db == "test_suite_users");
           // test that jchris still has the foo role
-          T(CouchDB.session().roles.indexOf("foo") != -1);
+          T(CouchDB.session().userCtx.roles.indexOf("foo") != -1);
         });      
 
     } finally {
diff --git a/share/www/script/test/oauth.js b/share/www/script/test/oauth.js
index d55d13e8..55f2f430 100644
--- a/share/www/script/test/oauth.js
+++ b/share/www/script/test/oauth.js
@@ -116,7 +116,7 @@ couchTests.oauth = function(debug) {
         
       // Create a user
       var jasonUserDoc = CouchDB.prepareUserDoc({
-        username: "jason",
+        name: "jason",
         roles: ["test"]
       }, "testpassword");
       T(usersDb.save(jasonUserDoc).ok);
diff --git a/share/www/script/test/security_validation.js b/share/www/script/test/security_validation.js
index d07195e1..43968426 100644
--- a/share/www/script/test/security_validation.js
+++ b/share/www/script/test/security_validation.js
@@ -105,7 +105,7 @@ couchTests.security_validation = function(debug) {
 
       // test the _whoami endpoint
       var resp = userDb.request("GET", "/_session");
-      var user = JSON.parse(resp.responseText)
+      var user = JSON.parse(resp.responseText).userCtx;
       T(user.name == "Damien Katz");
       // test that the roles are listed properly
       TEquals(user.roles, []);
diff --git a/share/www/script/test/users_db.js b/share/www/script/test/users_db.js
index c287ce68..d2cd0a4c 100644
--- a/share/www/script/test/users_db.js
+++ b/share/www/script/test/users_db.js
@@ -32,11 +32,11 @@ couchTests.users_db = function(debug) {
     
     // test that you can login as a user using basic auth
     var jchrisUserDoc = CouchDB.prepareUserDoc({
-      username: "jchris@apache.org"
+      name: "jchris@apache.org"
     }, "funnybone");
     T(usersDb.save(jchrisUserDoc).ok);
     
-    T(CouchDB.session().name == null);
+    T(CouchDB.session().userCtx.name == null);
 
     // test that you can use basic auth aginst the users db
     var s = CouchDB.session({
@@ -44,20 +44,48 @@ couchTests.users_db = function(debug) {
         "Authorization" : "Basic amNocmlzQGFwYWNoZS5vcmc6ZnVubnlib25l"
       }
     });
-    T(s.name == "jchris@apache.org");
-    T(s.user_doc._id == "org.couchdb.user:jchris@apache.org");
-    T(s.info.authenticated == "{couch_httpd_auth, default_authentication_handler}");
-    T(s.info.user_db == "test_suite_users");
-    TEquals(["{couch_httpd_oauth, oauth_authentication_handler}", 
-      "{couch_httpd_auth, cookie_authentication_handler}", 
-      "{couch_httpd_auth, default_authentication_handler}"], s.info.handlers);
+    T(s.userCtx.name == "jchris@apache.org");
+    T(s.info.authenticated == "default");
+    T(s.info.authentication_db == "test_suite_users");
+    TEquals(["oauth", "cookie", "default"], s.info.authentication_handlers);
     var s = CouchDB.session({
       headers : {
-        "Authorization" : "Basic Xzpf" // username and pass of _:_
+        "Authorization" : "Basic Xzpf" // name and pass of _:_
       }
     });
     T(s.name == null);
-    T(s.info.authenticated == "{couch_httpd_auth, default_authentication_handler}");
+    T(s.info.authenticated == "default");
+    
+    
+    // ok, now create a conflicting edit on the jchris doc, and make sure there's no login.
+    var jchrisUser2 = JSON.parse(JSON.stringify(jchrisUserDoc));
+    jchrisUser2.foo = "bar";
+    T(usersDb.save(jchrisUser2).ok);
+    try {
+      usersDb.save(jchrisUserDoc);
+      T(false && "should be an update conflict")
+    } catch(e) {
+      T(true);
+    }
+    // save as bulk with new_edits=false to force conflict save
+    var resp = usersDb.bulkSave([jchrisUserDoc],{all_or_nothing : true});
+    
+    var jchrisWithConflict = usersDb.open(jchrisUserDoc._id, {conflicts : true});
+    T(jchrisWithConflict._conflicts.length == 1)
+    
+    // no login with conflicted user doc
+    try {
+      var s = CouchDB.session({
+        headers : {
+          "Authorization" : "Basic amNocmlzQGFwYWNoZS5vcmc6ZnVubnlib25l"
+        }
+      });
+      T(false && "this will throw")
+    } catch(e) {
+      T(e.error == "unauthorized")
+      T(/conflict/.test(e.reason))
+    }
+
   };
   
   run_on_modified_server(