Remove login: admin from _internal handlers.

app.yaml

@@ -12,10 +12,6 @@ handlers:
   script: caravel.app
   login: admin
   secure: always
-- url: /_internal/.*
-  script: caravel.app
-  login: admin
-  secure: always
 - url: /login.*
   script: caravel.app
   login: required

caravel/daemons/delete_old_photos.py

@@ -3,10 +3,14 @@
 """
 
 from caravel import app, model
+from google.appengine.api import users
 
 
 @app.route('/_internal/collect_garbage')
 def collect_garbage():
+    if not users.is_current_user_admin():
+        return "???"
+
     model.Photo.remove_old_photos()
 
     return "ok"

caravel/daemons/migration.py

@@ -6,6 +6,7 @@
 from caravel import app, model
 import itertools
 import datetime
+from google.appengine.api import users
 
 
 def grouper(iterable, n, fillvalue=None):
@@ -17,6 +18,9 @@ def grouper(iterable, n, fillvalue=None):
 
 @app.route("/_internal/migrate_schema")
 def migrate_schema():
+    if not users.is_current_user_admin():
+        return "???"
+
     horizon = datetime.datetime.now() - model.Listing.MARK_AS_OLD_AFTER
 
     q = model.Listing.query(

caravel/daemons/nag_moderators.py

@@ -5,9 +5,14 @@
 from caravel import app, model, utils
 from caravel.utils import emails
 from flask import render_template
+from google.appengine.api import users
+
 
 @app.route('/_internal/nag_moderators')
 def nag_moderators():
+    if not users.is_current_user_admin():
+        return "???"
+
     listings = list(model.UnapprovedListing().query())
     inquiries = list(model.UnapprovedInquiry().query())
     pending = listings + inquiries
@@ -20,7 +25,7 @@ def nag_moderators():
         subject="{} Inquiries, {} Listings Pending".format(
             len(inquiries), len(listings)),
         text=render_template("email/nag_moderators.txt",
-            listings=listings, inquiries=inquiries),
+                             listings=listings, inquiries=inquiries),
         html=None
     )
 

caravel/tests/test_listings.py

@@ -64,7 +64,8 @@ def test_post_inquiry(self):
         self.assertEqual(self.emails, [])
 
         # Notify the moderators that something has happened.
-        self.get("/_internal/nag_moderators")
+        with self.google_apps_user("admin@uchicago.edu"):
+            self.get("/_internal/nag_moderators")
 
         # Ensure that the moderators received the right email.
         self.assertEqual(

caravel/tests/test_migration.py

@@ -68,7 +68,8 @@ def test_migrate_from_old(self):
         self.assertEquals(listing.version, 12)
 
         # Trigger an update cronjob.
-        self.get("/_internal/migrate_schema")
+        with self.google_apps_user("admin@uchicago.edu"):
+            self.get("/_internal/migrate_schema")
 
         # Verify that we have now changed on disk.
         listing = Listing.get_by_key_name("my-listing-name")