Changeset f9e571 in indico for indico/MaKaC/webinterface/pages/api.py

Timestamp:

08/23/11 15:38:49 (21 months ago)

Author:

Jose Benito <jose.benito.gonzalez@…>

Branches:

master, hello-world-walkthrough, ipv6, v0.98-series, v0.98.2, v0.98.3, v0.98b2, v0.99, 051b2622c51afb171a1dedb46a0df4fbb0cbd02e, 0da0c1403bae8e51d8229f460181c71b9e6dda72

Children:

a4766f

Parents:

9c31e72

git-author:

Adrian Moennich <jerome.ernst.monnich@…> (05/11/11 11:07:33)

git-committer:

Jose Benito <jose.benito.gonzalez@…> (08/23/11 15:38:49)

Message:

[IMP] Improve accesskey/signature and cache system

• cache stores fossil instead of serialized response
• https enforcement can be enabled/disabled
• api key/signature checking can now be configured
• add request argument to make an authenticated request return only public data

File:

• indico/MaKaC/webinterface/pages/api.py (modified) (3 diffs)

indico/MaKaC/webinterface/pages/api.py

@@ -20 +20 @@
 from operator import attrgetter
 
+from MaKaC.common.info import HelperMaKaCInfo
 from MaKaC.webinterface.pages.admins import WPPersonalArea, WPServicesCommon
 from MaKaC.webinterface.wcomponents import WTemplated
 from indico.web.http_api.auth import APIKeyHolder
+from indico.web.http_api import API_MODE_SIGNED, API_MODE_ONLYKEY_SIGNED, API_MODE_ALL_SIGNED
 
 
@@ -34 +36 @@
         self._tabAPI.setActive()
 
-
 class WUserAPI(WTemplated):
 
@@ -41 +42 @@
 
     def getVars(self):
+        minfo = HelperMaKaCInfo.getMaKaCInfoInstance()
+        apiMode = minfo.getAPIMode()
         vars = WTemplated.getVars(self)
         vars['avatar'] = self._avatar
         vars['apiKey'] = self._avatar.getAPIKey()
         vars['isAdmin'] = self._rh._getUser().isAdmin()
+        vars['signingEnabled'] = apiMode in (API_MODE_SIGNED, API_MODE_ONLYKEY_SIGNED, API_MODE_ALL_SIGNED)
         return vars
 
 
-class WPAdminAPI(WPServicesCommon):
+class WPAdminAPIOptions(WPServicesCommon):
 
     def _getTabContent(self, params):
-        c = WAdminAPI()
+        c = WAdminAPIOptions()
         return c.getHTML(params)
 
     def _setActiveTab( self ):
         self._subTabHTTPAPI.setActive()
+        self._subTabHTTPAPI_Options.setActive()
+
+class WAdminAPIOptions(WTemplated):
+
+    def getVars(self):
+        minfo = HelperMaKaCInfo.getMaKaCInfoInstance()
+        vars = WTemplated.getVars(self)
+        vars['apiMode'] = minfo.getAPIMode()
+        vars['httpsRequired'] = minfo.isAPIHTTPSRequired()
+        return vars
 
 
-class WAdminAPI(WTemplated):
+class WPAdminAPIKeys(WPServicesCommon):
+
+    def _getTabContent(self, params):
+        c = WAdminAPIKeys()
+        return c.getHTML(params)
+
+    def _setActiveTab( self ):
+        self._subTabHTTPAPI.setActive()
+        self._subTabHTTPAPI_Keys.setActive()
+
+class WAdminAPIKeys(WTemplated):
 
     def getVars(self):