From d4f4487fb64a63dc6f3c492db7c4fdbcc7e6a997 Mon Sep 17 00:00:00 2001
From: Kevin Froman <beardog@mailbox.org>
Date: Thu, 19 Mar 2020 01:44:44 -0500
Subject: [PATCH] finished block list endpoint for lan and added get data
 endpoint

---
 src/lan/server/__init__.py    | 10 +++++++++-
 src/runtests/lanservertest.py |  7 +++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/lan/server/__init__.py b/src/lan/server/__init__.py
index 127b237e..1fcd6f89 100644
--- a/src/lan/server/__init__.py
+++ b/src/lan/server/__init__.py
@@ -7,11 +7,13 @@ from flask import Flask
 from flask import Response
 from gevent import sleep
 
+from onionrblocks.onionrblockapi import Block
 from httpapi.fdsafehandler import FDSafeHandler
 from netcontroller import get_open_port
 import config
 from coredb.blockmetadb import get_block_list
 from lan.getip import lan_ips, best_ip
+from onionrutils import stringvalidators
 """
     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
@@ -40,7 +42,13 @@ class LANServer:
 
         @app.route('/blist/<time>')
         def get_block_list_for_lan(time):
-            return Response(get_block_list(dateRec=time).split('\n'))
+            return Response('\n'.join(get_block_list(dateRec=time)))
+
+        @app.route('/get/<block>')
+        def get_block_data(block):
+            if not stringvalidators.validate_hash(block):
+                raise ValueError
+            return Response(Block(block).raw, mimetype='application/octet-stream')
 
         @app.route("/ping")
         def ping():
diff --git a/src/runtests/lanservertest.py b/src/runtests/lanservertest.py
index f085ab4e..99e4ce31 100644
--- a/src/runtests/lanservertest.py
+++ b/src/runtests/lanservertest.py
@@ -2,11 +2,18 @@ import requests
 
 from lan.getip import best_ip
 
+from onionrblocks import insert, onionrblockapi
+
 def test_lan_server(testmanager):
 
     for i in range(1024, 65536):
         try:
             if requests.get(f"http://{best_ip}:{i}/ping").text == 'pong!':
+                bl = insert('test data')
+                if bl not in requests.get(f"http://{best_ip}:{i}/blist/0").text:
+                    raise ValueError
+                if onionrblockapi.Block(bl).raw != requests.get(f"http://{best_ip}:{i}/get/{bl}").content:
+                    raise ValueError
                 break
         except requests.exceptions.ConnectionError:
             pass