You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by st...@apache.org on 2015/02/14 01:26:30 UTC
cordova-registry git commit: readded _rev check, removed logs
Repository: cordova-registry
Updated Branches:
refs/heads/master ef636d2b7 -> db14846f6
readded _rev check, removed logs
Project: http://git-wip-us.apache.org/repos/asf/cordova-registry/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-registry/commit/db14846f
Tree: http://git-wip-us.apache.org/repos/asf/cordova-registry/tree/db14846f
Diff: http://git-wip-us.apache.org/repos/asf/cordova-registry/diff/db14846f
Branch: refs/heads/master
Commit: db14846f61e959e8be8c2b0bf84502fbce37ccad
Parents: ef636d2
Author: Steve Gill <st...@gmail.com>
Authored: Fri Feb 13 16:26:31 2015 -0800
Committer: Steve Gill <st...@gmail.com>
Committed: Fri Feb 13 16:26:31 2015 -0800
----------------------------------------------------------------------
updates.js | 6 +++---
validate_doc_update.js | 12 ------------
2 files changed, 3 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-registry/blob/db14846f/updates.js
----------------------------------------------------------------------
diff --git a/updates.js b/updates.js
index c3b0110..deeb5f4 100644
--- a/updates.js
+++ b/updates.js
@@ -4,7 +4,7 @@ updates.package = function (doc, req) {
require("monkeypatch").patch(Object, Date, Array, String)
var semver = require("semver")
var valid = require("valid")
- function error (reason) {;
+ function error (reason) {
return [{_id: "error: forbidden", forbidden:reason}, JSON.stringify({forbidden:reason})]
}
@@ -94,9 +94,9 @@ updates.package = function (doc, req) {
var newdoc = JSON.parse(req.body)
, changed = false
- /*if (doc._rev && doc._rev !== newdoc._rev) {
+ if (doc._rev && doc._rev !== newdoc._rev) {
return error( "must supply latest _rev to update existing package" )
- }*/
+ }
for (var i in newdoc) if (typeof newdoc[i] === "string" || i === "maintainers") {
doc[i] = newdoc[i]
}
http://git-wip-us.apache.org/repos/asf/cordova-registry/blob/db14846f/validate_doc_update.js
----------------------------------------------------------------------
diff --git a/validate_doc_update.js b/validate_doc_update.js
index e6afc07..4010b33 100644
--- a/validate_doc_update.js
+++ b/validate_doc_update.js
@@ -3,8 +3,6 @@ module.exports = function (doc, oldDoc, user, dbCtx) {
if (!ok) throw {forbidden:message}
}
- log('validate');
- log(user);
// can't write to the db without logging in.
if (!user) {
throw { unauthorized: "Please log in before writing to the db" }
@@ -115,23 +113,16 @@ module.exports = function (doc, oldDoc, user, dbCtx) {
// check if the user is allowed to write to this package.
function validUser () {
- log('validUser');
-
if ( !oldDoc || !oldDoc.maintainers ) return true
//if (isAdmin()) return true
- log(oldDoc.maintainers);
if (typeof oldDoc.maintainers !== "object") return true
for (var i = 0, l = oldDoc.maintainers.length; i < l; i ++) {
- log('i');
if (oldDoc.maintainers[i].name === user.name) return true
}
return false
}
function isAdmin () {
- log("isAdmin");
- log(user.name);
- log(dbCtx.admins)
if (dbCtx &&
dbCtx.admins) {
if (dbCtx.admins.names &&
@@ -141,14 +132,11 @@ module.exports = function (doc, oldDoc, user, dbCtx) {
if (dbCtx.admins.roles.indexOf(user.roles[i]) !== -1) return true
}
}
- log('user.roles.indexOf');
- log(user.roles);
return user && user.roles.indexOf("_admin") >= 0
}
try {
var vu = validUser()
- log(vu);
} catch (er) {
assert(false, "problem checking user validity");
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org