sites now support multi pages

onionr/__init__.py

@@ -59,8 +59,8 @@ setup.setup_config()
 setup.setup_default_plugins()
 
 def onionr_main():
+    """Onionr entrypoint, start command processor"""
     parser.register()
-    return
 
 if ran_as_script:
     onionr_main()

onionr/httpapi/onionrsitesapi/__init__.py

@@ -34,7 +34,7 @@ from . import sitefiles
 
 site_api = Blueprint('siteapi', __name__)
 
-@site_api.route('/site/<name>', endpoint='site')
+@site_api.route('/site/<name>/', endpoint='site')
 def site(name: str)->Response:
     """Accept a site 'name', if pubkey then show multi-page site, if hash show single page site"""
     resp: str = 'Not Found'
@@ -63,3 +63,33 @@ def site(name: str)->Response:
     if resp == 'Not Found' or not resp:
         abort(404)
     return Response(resp)
+
+@site_api.route('/site/<name>/<file>', endpoint='siteFile')
+def site_file(name: str, file: str)->Response:
+    """Accept a site 'name', if pubkey then show multi-page site, if hash show single page site"""
+    resp: str = 'Not Found'
+    mime_type = 'text/html'
+
+    # If necessary convert the name to base32 from mnemonic
+    if mnemonickeys.DELIMITER in name:
+        name = mnemonickeys.get_base32(name)
+
+    # Now make sure the key is regardless a valid base32 format ed25519 key (readding padding if necessary)
+    if stringvalidators.validate_pub_key(name):
+        name = unpaddedbase32.repad(name)
+        resp = sitefiles.get_file(name, file)
+
+    elif stringvalidators.validate_hash(name):
+        try:
+            resp = onionrblockapi.Block(name).bcontent
+        except onionrexceptions.NoDataAvailable:
+            abort(404)
+        except TypeError:
+            pass
+        try:
+            resp = base64.b64decode(resp)
+        except binascii.Error:
+            pass
+    if resp == 'Not Found' or not resp:
+        abort(404)
+    return Response(resp)

onionr/httpapi/onionrsitesapi/sitefiles.py

@@ -3,6 +3,8 @@ import tarfile
 import io
 import os
 
+import unpaddedbase32
+
 from coredb import blockmetadb
 from onionrblocks import onionrblockapi
 from onionrblocks import insert
@@ -12,9 +14,11 @@ from onionrtypes import UserID, DeterministicKeyPassphrase, BlockHash
 
 from onionrcrypto import generate_deterministic
 
-def find_site_gzip(user_id: str)->str:
+def find_site_gzip(user_id: str)->tarfile.TarFile:
+    """Return verified site tar object"""
     sites = blockmetadb.get_blocks_by_type('osite')
     user_site = None
+    user_id = unpaddedbase32.repad(user_id)
     for site in sites:
         block = onionrblockapi.Block(site)
         if block.isSigner(user_id):
@@ -24,12 +28,13 @@ def find_site_gzip(user_id: str)->str:
     return None
 
 def get_file(user_id, file)->Union[bytes, None]:
+    """Get a site file content"""
     ret_data = ""
     site = find_site_gzip(user_id)
     if site is None: return None
-    for file in site.getmembers():
+    for t_file in site.getmembers():
-        if file.name == file:
+        if t_file.name.replace('./', '') == file:
-            return site.extractfile(file)
+            return site.extractfile(t_file)
     return None
 
 def create_site(admin_pass: DeterministicKeyPassphrase, directory:str='.')->Tuple[UserID, BlockHash]:
@@ -43,6 +48,6 @@ def create_site(admin_pass: DeterministicKeyPassphrase, directory:str='.')->Tupl
 
     raw_tar.seek(0)
 
-    block_hash = insert(raw_tar.read(), signing_key=private_key)
+    block_hash = insert(raw_tar.read(), header='osite', signing_key=private_key, sign=True)
 
     return (public_key, block_hash)

onionr/httpapi/security/client.py

@@ -24,7 +24,7 @@ from . import pluginwhitelist
 
 # Be extremely mindful of this. These are endpoints available without a password
 whitelist_endpoints = ['www', 'staticfiles.homedata', 'staticfiles.sharedContent', 
-'staticfiles.friends', 'staticfiles.friendsindex', 'siteapi.site', 'staticfiles.onionrhome',
+'staticfiles.friends', 'staticfiles.friendsindex', 'siteapi.site', 'siteapi.siteFile', 'staticfiles.onionrhome',
 'themes.getTheme', 'staticfiles.onboarding', 'staticfiles.onboardingIndex']
 
 class ClientAPISecurity:

onionr/onionrblocks/insert.py

@@ -29,7 +29,7 @@ def insert_block(data: Union[str, bytes], header: str ='txt',
     if signing_key != '':
         # if it was specified to use an alternative private key
         our_private_key = signing_key
-        our_pub_key = crypto.cryptoutils.get_pub_key_from_priv(our_private_key)
+        our_pub_key = bytesconverter.bytes_to_str(crypto.cryptoutils.get_pub_key_from_priv(our_private_key))
 
     use_subprocess = powchoice.use_subprocess(config)
     storage_counter = storagecounter.StorageCounter()

onionr/onionrcommands/parser/recommend.py

@@ -12,4 +12,4 @@ def recommend(print_default: bool = True):
             if SequenceMatcher(None, tried, word).ratio() >= 0.75:
                 logger.warn('%s "%s", did you mean "%s"?' % (print_message, tried, word), terminal=True)
                 return
-    if print_default: logger.error('%s "%s"' % (print_message, tried), terminal=True)
+    if print_default: logger.error('%s "%s"' % (print_message, tried), terminal=True)