Merge branch 'master' of https://github.com/tumblr/platform

tumblr · Jul 24, 2012 · d27251a · d27251a
2 parents 38e5ebf + c133c07
commit d27251a
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 4 deletions.
diff --git a/collins/app/controllers/IpmiApi.scala b/collins/app/controllers/IpmiApi.scala
@@ -71,6 +71,6 @@ trait IpmiApi {
       err => formatResponseData(err),
       suc => formatResponseData(suc)
     )
-  }(SecuritySpec(true, Seq("infra")))
+  }(Permissions.IpmiApi.UpdateIpmi)
 
 }
diff --git a/collins/app/controllers/Permissions.scala b/collins/app/controllers/Permissions.scala
@@ -70,6 +70,11 @@ object Permissions {
     val Index = spec("index", Spec)
   }
 
+  object IpmiApi extends PermSpec("controllers.IpmiApi") {
+    val Spec = spec(AdminSpec)
+    val UpdateIpmi = spec("updateIpmi", Spec)
+  }
+
   object IpAddressApi extends PermSpec("controllers.IpAddressApi") {
     val Spec = spec(AdminSpec)
     val AllocateAddress = spec("allocateAddress", Spec)
@@ -90,4 +95,10 @@ object Permissions {
     val Intake = spec("intake", AdminSpec)
   }
 
+  object TagApi extends PermSpec("controllers.TagApi") {
+    val Spec = spec(LoggedIn)
+    val GetTags = spec("getTags", Spec)
+    val GetTagValues = spec("getTagValues", AdminSpec)
+  }
+
 }
diff --git a/collins/app/controllers/Security.scala b/collins/app/controllers/Security.scala
@@ -47,7 +47,7 @@ object SecureController {
                   logger.debug("Credentials required and found, processing action")
                   getAction(Some(user), action, request)
                 } else {
-                  logger.warn("Credentials required and NOT found for %s".format(user.username))
+                  logger.warn("Credentials required for %s and NOT found for %s".format(request.path, user.username))
                   onUnauthorized(request)
                 }
               }

diff --git a/collins/app/controllers/TagApi.scala b/collins/app/controllers/TagApi.scala
@@ -21,7 +21,7 @@ trait TagApi {
     val jsArray = JsArray(js.toList)
     val data = ResponseData(Results.Ok, JsObject(Seq("tags" -> jsArray)))
     formatResponseData(data)
-  }(SecuritySpec(true))
+  }(Permissions.TagApi.GetTags)
 
   def getTagValues(tag: String) = SecureAction { implicit req =>
     val response =
@@ -35,6 +35,6 @@ trait TagApi {
         }
       }.getOrElse(Api.getErrorMessage("Tag not found", Results.NotFound))
     formatResponseData(response)
-  }(SecuritySpec(true, Seq("infra")))
+  }(Permissions.TagApi.GetTagValues)
 
 }