Miko/Hippolyzer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

completely removed USE_REDIRECT and friends as the LL AD has been fixed by now and it's not needed anymore.

Browse Source
This commit is contained in:
tao.takashi
2008-08-27 20:37:02 +00:00
committed by Salad Dais
parent e23f2c5cf0
commit d6d34892a8
1 changed files with 12 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
pyogp/lib/base/agentdomain.py
View File

@@ -2,8 +2,6 @@ from agent import Agent
from interfaces import ISerialization
from caps import SeedCapability
USE_REDIRECT=False
import urllib2
from zope.interface import implements
@@ -19,24 +17,6 @@ from agent import Agent
from avatar import Avatar
from caps import SeedCapability
# URL Opener for the agent domain login
#
if USE_REDIRECT:
# REMOVE THIS WHEN THE REDIRECT IS NOT NEEDED ANYMORE FOR LINDEN LAB!
class RedirectHandler(urllib2.HTTPRedirectHandler):
def http_error_302(self, req, fp, code, msg, headers):
#ignore the redirect, grabbing the seed cap url from the headers
# TODO: add logging and error handling
return headers['location']
# post to auth.cgi, ignoring the built in redirect
AgentDomainLoginOpener = urllib2.build_opener(RedirectHandler())
class AgentDomain(object):
"""an agent domain endpoint"""
@@ -56,32 +36,18 @@ class AgentDomain(object):
# now create the request. We assume for now that self.uri is the login uri
# TODO: make this pluggable so we can use other transports like eventlet in the future
# TODO: add logging and error handling
if USE_REDIRECT:
request = urllib2.Request(self.uri,payload,headers)
try:
res = AgentDomainLoginOpener.open(request)
except urllib2.HTTPError,e:
print e.read()
raise
if type(res)!=type(""):
seed_cap_url_data = res.read() # it might be an addinfourl object
seed_cap_url = llsd.parse(seed_cap_url_data)['agent_seed_capability']
else:
# this only happens in the Linden Lab Agent Domain with their redirect
seed_cap_url = res
else:
restclient = getUtility(IRESTClient)
try:
response = restclient.POST(self.uri, payload, headers=headers)
except HTTPError, error:
print "error", error.code, error.msg
print error.fp.read()
raise
seed_cap_url_data = response.body
seed_cap_url = llsd.parse(seed_cap_url_data)['agent_seed_capability']
self.seed_cap = SeedCapability('seed_cap', seed_cap_url)
return Agent(self)
restclient = getUtility(IRESTClient)
try:
response = restclient.POST(self.uri, payload, headers=headers)
except HTTPError, error:
print "error", error.code, error.msg
print error.fp.read()
raise
seed_cap_url_data = response.body
seed_cap_url = llsd.parse(seed_cap_url_data)['agent_seed_capability']
self.seed_cap = SeedCapability('seed_cap', seed_cap_url)
return Agent(self)
class PlaceAvatar(grok.Adapter):