guopengcheng/ahserver_g
1
0
Fork 0
Code Pull Requests Activity

bugfix

Browse Source
This commit is contained in:
yumoqing 2023-04-07 13:16:54 +08:00
parent 46352099a2
commit a857a2b4a1
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ahserver/processorResource.py
View File

@ -100,7 +100,9 @@ class ProcessorResource(AppLogger, StaticResource,Url2File):
def abspath(self, request, path:str): def abspath(self, request, path:str):
url = self.entireUrl(request, path) url = self.entireUrl(request, path)
return self.url2file(url) fname = self.url2file(url)
print(f'abspath():, {path=}, {url=}, {fname=}')
return fname
async def getPostData(self,request: Request) -> dict: async def getPostData(self,request: Request) -> dict:
reader = await request.multipart() reader = await request.multipart()
@ -219,7 +221,8 @@ class ProcessorResource(AppLogger, StaticResource,Url2File):
self.y_env.path_call = partial(self.path_call,request) self.y_env.path_call = partial(self.path_call,request)
self.user = await auth.get_auth(request) self.user = await auth.get_auth(request)
self.y_env.user = self.user self.y_env.user = self.user
self.request_filename = self.url2file(str(request.url)) self.request_filename = self.url2file(str(request.path))
print(f'225:{request.path=}, {self.request_filename=}')
path = request.path path = request.path
config = getConfig() config = getConfig()
if config.website.dbadm and path.startswith(config.website.dbadm): if config.website.dbadm and path.startswith(config.website.dbadm):
@ -310,6 +313,8 @@ class ProcessorResource(AppLogger, StaticResource,Url2File):
host = '/'.join(str(request.url).split('/')[:3]) host = '/'.join(str(request.url).split('/')[:3])
path = url[len(host):].split('?')[0] path = url[len(host):].split('?')[0]
real_path = self.abspath(request, path) real_path = self.abspath(request, path)
if real_path is None:
return None
if config.website.startswiths: if config.website.startswiths:
for a in config.website.startswiths: for a in config.website.startswiths:
if path.startswith(a.leading): if path.startswith(a.leading):
@ -337,8 +342,8 @@ class ProcessorResource(AppLogger, StaticResource,Url2File):
async def path_call(self, request, path, params={}): async def path_call(self, request, path, params={}):
url = self.entireUrl(request, path) url = self.entireUrl(request, path)
fpath = self.url2file(url) fpath = self.url2file(url)
print(f'path_call():{path=}, {url=}, {fpath=}')
processor = self.url2processor(request, url, fpath) processor = self.url2processor(request, url, fpath)
return await processor.path_call(request, params=params) return await processor.path_call(request, params=params)

7
ahserver/url2file.py
View File

@ -33,6 +33,7 @@ class Url2File:
return real_path return real_path
def url2file(self, url: str) -> str: def url2file(self, url: str) -> str:
ourl = url
url = url.split('?')[0] url = url.split('?')[0]
real_path = self.url2ospath(url) real_path = self.url2ospath(url)
if os.path.isdir(real_path): if os.path.isdir(real_path):
@ -45,11 +46,11 @@ class Url2File:
return real_path return real_path
if not os.path.isdir(os.path.dirname(real_path)): if not os.path.isdir(os.path.dirname(real_path)):
print(f'url2file() return None, {real_path:}') print(f'url2file() return None, {real_path=}, {url=},{ourl=}, {self.path=}')
return None return None
if not self.inherit: if not self.inherit:
print(f'url2file() return None, self.inherit is false') print(f'url2file() return None, self.inherit is false, {url:}, {self.path=}')
return None return None
items = url.split('/') items = url.split('/')
@ -57,7 +58,7 @@ class Url2File:
del items[-2] del items[-2]
url = '/'.join(items) url = '/'.join(items)
return self.url2file(url) return self.url2file(url)
print(f'url2file() return None finally, {items:}') print(f'url2file() return None finally, {items:}, {url=}, {ourl=}, {self.path=}')
return None return None
def relatedurl(self,url: str, name: str) -> str: def relatedurl(self,url: str, name: str) -> str: