Skip to content

Commit ab5109c

Browse files
TaykYokufstagni
authored andcommitted
feat (Framework): move Proxy Manager to https
1 parent 3476d79 commit ab5109c

File tree

2 files changed

+19
-9
lines changed

2 files changed

+19
-9
lines changed

src/DIRAC/FrameworkSystem/Service/ProxyManagerHandler.py

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
DEFAULT_MAIL_FROM = "[email protected]"
1818

1919

20-
class ProxyManagerHandler(RequestHandler):
20+
class ProxyManagerHandlerMixin:
2121

2222
__maxExtraLifeFactor = 1.5
2323
__proxyDB = None
@@ -72,14 +72,6 @@ def __generateUserProxiesInfo(self):
7272
proxiesInfo[userDN][userGroup] = record[expirationIndex]
7373
return proxiesInfo
7474

75-
def __addKnownUserProxiesInfo(self, retDict):
76-
"""Given a S_OK/S_ERR add a proxies entry with info of all the proxies a user has uploaded
77-
78-
:return: S_OK(dict)/S_ERROR()
79-
"""
80-
retDict["proxies"] = self.__generateUserProxiesInfo()
81-
return retDict
82-
8375
auth_getUserProxiesInfo = ["authenticated"]
8476
types_getUserProxiesInfo = []
8577

@@ -411,3 +403,7 @@ def export_getVOMSProxyWithToken(self, userDN, userGroup, requestPem, requiredLi
411403
return result
412404
self.__proxyDB.logAction("download voms proxy with token", credDict["DN"], credDict["group"], userDN, userGroup)
413405
return self.__getVOMSProxy(userDN, userGroup, requestPem, requiredLifetime, vomsAttribute, True)
406+
407+
408+
class ProxyManagerHandler(ProxyManagerHandlerMixin, RequestHandler):
409+
pass
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
""" TornadoProxyManager is the implementation of the ProxyManagement service in HTTPS
2+
3+
.. literalinclude:: ../ConfigTemplate.cfg
4+
:start-after: ##BEGIN ProxyManager:
5+
:end-before: ##END
6+
:dedent: 2
7+
:caption: ProxyManager options
8+
"""
9+
from DIRAC.Core.Tornado.Server.TornadoService import TornadoService
10+
from DIRAC.FrameworkSystem.Service.ProxyManagerHandler import ProxyManagerHandlerMixin
11+
12+
13+
class TornadoProxyManagerHandler(ProxyManagerHandlerMixin, TornadoService):
14+
pass

0 commit comments

Comments
 (0)