kev/Onionr
1
0
Fork 0
Code Issues 24 Pull Requests Projects Releases 2 Wiki Activity

fix index.html not being auto loaded in subdirs

Browse Source 
fix pep8 styling in sitefiles.py
This commit is contained in:
Kevin 2020-06-13 17:51:09 -05:00
parent 3d0f1d9337
commit a401f49da3
1 changed files with 25 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/httpapi/onionrsitesapi/sitefiles.py
View File

@ -1,21 +1,6 @@
""" """Onionr - Private P2P Communication.
Onionr - Private P2P Communication
Read onionr site files Read onionr site files
"""
"""
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
""" """
from typing import Union, Tuple from typing import Union, Tuple
import tarfile import tarfile
@ -32,30 +17,52 @@ from onionrblocks import insert
from onionrtypes import UserID, DeterministicKeyPassphrase, BlockHash from onionrtypes import UserID, DeterministicKeyPassphrase, BlockHash
from onionrcrypto import generate_deterministic from onionrcrypto import generate_deterministic
"""
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
"""
def find_site_gzip(user_id: str)->tarfile.TarFile: def find_site_gzip(user_id: str)->tarfile.TarFile:
"""Return verified site tar object""" """Return verified site tar object"""
sites = blockmetadb.get_blocks_by_type('osite') sites = blockmetadb.get_blocks_by_type('osite')
user_site = None user_site = None
unpadded_user = user_id
user_id = unpaddedbase32.repad(user_id) user_id = unpaddedbase32.repad(user_id)
for site in sites: for site in sites:
block = onionrblockapi.Block(site) block = onionrblockapi.Block(site)
if block.isSigner(user_id): if block.isSigner(user_id) or block.isSigner(unpadded_user):
user_site = block user_site = block
if not user_site is None: if not user_site is None:
return tarfile.open(fileobj=io.BytesIO(user_site.bcontent), mode='r') return tarfile.open(fileobj=io.BytesIO(user_site.bcontent), mode='r')
return None return None
def get_file(user_id, file)->Union[bytes, None]: def get_file(user_id, file)->Union[bytes, None]:
"""Get a site file content""" """Get a site file content"""
ret_data = "" ret_data = ""
site = find_site_gzip(user_id) site = find_site_gzip(user_id)
if file.endswith('/'):
file += 'index.html'
if site is None: return None if site is None: return None
for t_file in site.getmembers(): for t_file in site.getmembers():
if t_file.name.replace('./', '') == file: if t_file.name.replace('./', '') == file:
return site.extractfile(t_file) return site.extractfile(t_file)
return None return None
def create_site(admin_pass: DeterministicKeyPassphrase, directory:str='.')->Tuple[UserID, BlockHash]: def create_site(admin_pass: DeterministicKeyPassphrase, directory:str='.')->Tuple[UserID, BlockHash]:
public_key, private_key = generate_deterministic(admin_pass) public_key, private_key = generate_deterministic(admin_pass)