added server sent events wrapper and example

src/apiservers/private/register_private_blueprints.py

@@ -9,6 +9,7 @@ from httpapi import security, friendsapi, profilesapi, configapi, insertblock
 from httpapi import miscclientapi, onionrsitesapi, apiutils
 from httpapi import directconnections
 from httpapi import themeapi
+from httpapi.sse.private import private_sse_blueprint
 
 """
     This program is free software: you can redistribute it and/or modify
@@ -44,6 +45,7 @@ def register_private_blueprints(private_api, app):
     app.register_blueprint(directconnections.DirectConnectionManagement(
         private_api).direct_conn_management_bp)
     app.register_blueprint(themeapi.theme_blueprint)
+    app.register_blueprint(private_sse_blueprint)
 
     def _add_events_bp():
         while True:

src/config/onboarding.py

@@ -10,6 +10,7 @@ from filepaths import onboarding_mark_file
 from onionrtypes import JSONSerializable
 from onionrtypes import OnboardingConfig
 import config
+from flask import g
 """
     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
@@ -37,23 +38,23 @@ def set_config_from_onboarding(config_settings: OnboardingConfig):
 
     get = _get_val_or_none
 
-    if get(config_settings, 'stateTarget') or not get(config_settings, 
+    if get(config_settings, 'stateTarget') or not get(config_settings,
                                                       'networkContribution'):
         config.set('general.security_level', 1)
 
     config.set('ui.theme', 'light')
     if get(config_settings, 'useDark'):
         config.set('ui.theme', 'dark')
-    
+
     if not get(config_settings,
                'useCircles') or config.get('general.security_level') > 0:
         config.set('plugins.disabled',
-                   config.get('plugins.disabled').append('flow'))
+                   config.get('plugins.disabled', []).append('flow'))
 
     if not get(config_settings, 'useMail'):
         config.set('plugins.disabled',
-                   config.get('plugins.disabled').append('pms'))
+                   config.get('plugins.disabled', []).append('pms'))
-    
+
     config.set('general.store_plaintext_blocks',
                get(config_settings, 'plainContrib'))
 

src/httpapi/security/client.py

@@ -23,7 +23,7 @@ from onionrservices import httpheaders
 from . import pluginwhitelist
 
 # Be extremely mindful of this. These are endpoints available without a password
-whitelist_endpoints = ['www', 'staticfiles.homedata', 'staticfiles.sharedContent', 
+whitelist_endpoints = ['www', 'staticfiles.homedata', 'staticfiles.sharedContent',
 'staticfiles.friends', 'staticfiles.friendsindex', 'siteapi.site', 'siteapi.siteFile', 'staticfiles.onionrhome',
 'themes.getTheme', 'staticfiles.onboarding', 'staticfiles.onboardingIndex']
 
@@ -50,6 +50,7 @@ class ClientAPISecurity:
             if request.endpoint in whitelist_endpoints:
                 return
             if request.path.startswith('/site/'): return
+
             try:
                 if not hmac.compare_digest(request.headers['token'], client_api.clientToken):
                     if not hmac.compare_digest(request.form['token'], client_api.clientToken):

src/httpapi/sse/README.md

@@ -0,0 +1,3 @@
+# sse
+
+This folder contains a wrapper for handling server sent event loops

src/httpapi/sse/__init__.py

@@ -0,0 +1,18 @@
+"""Onionr - Private P2P Communication.
+
+server sent event modules, incl a wrapper and endpoints for client + public api
+"""
+"""
+    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/>.
+"""

src/httpapi/sse/private/__init__.py

@@ -0,0 +1,16 @@
+from flask import g, Blueprint
+from gevent import sleep
+
+from .. import wrapper
+
+private_sse_blueprint = Blueprint('privatesse', __name__)
+SSEWrapper = wrapper.SSEWrapper()
+
+
+@private_sse_blueprint.route('/hello')
+def srteam_meme():
+    def print_hello():
+        while True:
+            yield "hello\n\n"
+            sleep(1)
+    return SSEWrapper.handle_sse_request(print_hello)

src/httpapi/sse/wrapper.py

@@ -0,0 +1,34 @@
+"""Onionr - Private P2P Communication.
+
+wrapper for server sent event endpoints
+"""
+from typing import Callable
+
+from flask import Response
+
+"""
+    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/>.
+"""
+
+
+class SSEWrapper:
+    def __init__(self):
+        self.active_count: int = 0
+
+    def handle_sse_request(self, handler: Callable):
+        self.active_count += 1
+        resp = Response(handler())
+        resp.content_type = "text/event-stream"
+        self.active_count -= 1
+        return resp

src/onionrblocks/deleteplaintext.py

@@ -0,0 +1,34 @@
+"""Onionr - P2P Anonymous Storage Network.
+
+Delete but do not blacklist plaintext blocks
+"""
+from coredb import blockmetadb
+from onionrstorage.removeblock import remove_block
+import onionrstorage
+from .onionrblockapi import Block
+"""
+    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 delete_plaintext_no_blacklist():
+    """Delete, but do not blacklist, plaintext blocks."""
+
+    block_list = blockmetadb.get_block_list()
+
+    for block in block_list:
+        block = Block(hash=block)
+        if not block.isEncrypted:
+            remove_block(block.hash)
+            onionrstorage.deleteBlock(block.hash)

static-data/www/board/board.js

@@ -129,7 +129,7 @@ function getBlocks(){
     var ch = document.getElementById('feedIDInput').value
     if (lastLoadedBoard !== ch){
         requested = []
-    
+
         toggleLoadingMessage()
         loadedAny = false
 
@@ -184,7 +184,6 @@ function loadMessage(blockHash, blockList, count, channel){
             }
         }
         setTimeout(function(){appendMessages(data, blockHash, before, channel)}, delay)
-        //appendMessages(data, blockHash, before)
     })
 }
 
@@ -208,7 +207,7 @@ newPostForm.onsubmit = function(){
           "token": webpass
         }
     })
-    .then((resp) => resp.text()) // Transform the data into json
+    .then((resp) => resp.text()) // Transform the data into text
     .then(function(data) {
         newPostForm.style.display = 'block'
         if (data == 'failure due to duplicate insert'){

tests/test_plaintext_config.py

@@ -1,28 +0,0 @@
-#!/usr/bin/env python3
-import sys, os
-sys.path.append(".")
-sys.path.append("src/")
-import unittest, uuid
-import json
-TEST_DIR = 'testdata/%s-%s' % (uuid.uuid4(), os.path.basename(__file__)) + '/'
-print("Test directory:", TEST_DIR)
-os.environ["ONIONR_HOME"] = TEST_DIR
-
-from utils import identifyhome, createdirs
-from onionrsetup import setup_config
-createdirs.create_dirs()
-setup_config()
-import config
-from coredb import blockmetadb
-from onionrblocks.insert import insert_block
-
-class TestTemplate(unittest.TestCase):
-    def test_plaintext_config(self):
-        b1 = insert_block('test block')
-        self.assertIn(b1, blockmetadb.get_block_list())
-        config.set('general.store_plaintext_blocks', False)
-        self.assertNotIn(b1, blockmetadb.get_block_list())
-
-
-
-unittest.main()