domain_check.py

@@ -1,5 +1,5 @@
 from re import compile, sub
-domains = ['jet', 'dyn']
+domains = ['jet', 'mirror', 'org', 'info', 'news', 'me']
 
 def domain_ok(domain):
 	global domains

interface.py

@@ -77,7 +77,11 @@ def update_sites(n, s_val):
 	res = []
 	for i in next(walk('cached/'), (None, None, []))[1]:
 		conf = read(f'cached/{i}/config.json')
-		res.append(html.Div([ dcc.Link(children=i, href=f'http://{i}',
+		if conf['type'] == 'dynamic':
+			res.append(html.Div([ dcc.Link(children=i, href=f'http://bore.pub:{conf["port"]}',
+													target='_blank') ], className='sites_elem'))
+		else:
+			res.append(html.Div([ dcc.Link(children=i, href=f'{domain}/{i}',
 													target='_blank') ], className='sites_elem'))
 	return res
 
@@ -91,4 +95,4 @@ def update_search(n):
 	return res
 
 #app.run(debug=True, port = 5555)
-app.run(debug=False, host = '0.0.0.0', port = 5555)
+app.run(debug=False, port = 5555)

main.py

@@ -7,9 +7,7 @@ from multiprocessing import Process
 from network import *
 from updater import *
 from proxy import *
-from web_proxy import *
 from status import *
-
 from db import *
 
 #
@@ -49,12 +47,9 @@ def main():
 	# http сервер
 	http = Thread(target = server_http)
 	http.start()
-	# Cервер обработки запросов
+	# сервер обработки запросов
 	srv = Thread(target = server, args=(http_port,))
 	srv.start()
-	# Прокси для браузера
-	http_proxy = Thread(target = web_proxy)
-	http_proxy.start()
 
 	# Стартуем авто-поиск портов и авто-обновление сайтов
 	updater = Thread(target = update_demon, args=(serv_port,))

network.py

@@ -124,7 +124,7 @@ def recv(s, data_out):
 	data_out.put(data)
 
 # op = operation
-def client(port, op = "ping", host = 'bore.del.pw'):
+def client(port, op = "ping", host = 'bore.pub'):
 	# Если порт не определён
 	if not port:
 		return None
@@ -173,10 +173,7 @@ def client(port, op = "ping", host = 'bore.del.pw'):
 				return "old"
 
 		# Скачиваем файлы
-		try:
+		g_site = get(f"http://{host}:{str(port)}/{site}.zip")
-			g_site = get(f"http://{host}:{str(port)}/{site}.zip")
-		except:
-			return 'error'
 		print('SIZE: ', g_site.headers['Content-Length']) # Размер
 
 		with open(f"verify/{site}.zip", "wb") as f:

proxy.py

@@ -10,18 +10,18 @@ def proxy_http(port):
 	global http_out
 	os = read()['os']
 	if os == 'Linux':
-		http_out = system(f'./bore local 8000 --to bore.del.pw --port {port}')
+		http_out = system(f'./bore local 8000 --to bore.pub --port {port}')
 	elif os == 'Windows' or os == 'Android':
-		http_out = system(f'bore local 8000 --to bore.del.pw --port {port}')
+		http_out = system(f'bore local 8000 --to bore.pub --port {port}')
 
 global serv_out ; serv_out = None
 def proxy_serv(port):
 	global serv_out
 	os = read()['os']
 	if os == 'Linux':
-		http_out = system(f'./bore local 8001 --to bore.del.pw --port {port}')
+		http_out = system(f'./bore local 8001 --to bore.pub --port {port}')
 	elif os == 'Windows' or os == 'Android':
-	  http_out = system(f'bore local 8001 --to bore.del.pw --port {port}')
+	  http_out = system(f'bore local 8001 --to bore.pub --port {port}')
 
 
 def watch_http(port):

requirements.txt

@@ -2,4 +2,3 @@ cryptography
 requests
 tqdm
 dash
-icecream

site_creator.py

@@ -134,7 +134,7 @@ elif op == '4':
 			client(port, f'publish_{domain}<>{http_port}')
 		sleep(5)
 
-host = 'bore.del.pw'
+host = 'bore.pub'
 # Проверяем тип сайта
 type = read(f'mysites//{domain}/config.json')['type']
 # Если динамический - вставляем спец страницу
@@ -163,7 +163,8 @@ if op != '':
 if pub == 'n':
 	exit()
 
-serv_port = int( read()['our_port'] )
+print('Введите ваш порт сервера (при запуске main.py)')
+serv_port = int(input('>> '))
 http_port = client(serv_port, f'is_{domain}')
 
 print('Получаем все порты...')

srv.sh

@@ -1,9 +0,0 @@
-while true
-do
-killall python
-sleep 2s
-killall python #Чтоб наверняка
-
-nohup python srv_main.py &
-sleep 6h
-done

srv_interface.py

@@ -62,7 +62,11 @@ def update_sites(n, s_val):
 	res = []
 	for i in next(walk('cached/'), (None, None, []))[1]:
 		conf = read(f'cached/{i}/config.json')
-		res.append(html.Div([ dcc.Link(children=i, href=f'http://{i}',
+		if conf['type'] == 'dynamic':
+			res.append(html.Div([ dcc.Link(children=i, href=f'http://bore.pub:{conf["port"]}',
+													target='_blank') ], className='sites_elem'))
+		else:
+			res.append(html.Div([ dcc.Link(children=i, href=f'{domain}/{i}',
 													target='_blank') ], className='sites_elem'))
 	return res
 
@@ -76,4 +80,4 @@ def update_search(n):
 	return res
 
 #app.run(debug=True, port = 5555)
-app.run(debug=False, host = '0.0.0.0', port = 5555)
+app.run(debug=False, port = 5555)

srv_main.py

@@ -7,9 +7,7 @@ from multiprocessing import Process
 from network import *
 from updater import *
 from proxy import *
-from web_proxy import *
 from status import *
-
 from db import *
 
 #
@@ -57,10 +55,6 @@ def main():
 	#updater = Thread(target = update_demon, args=(serv_port,))
 	#updater.start()
 
-	# Прокси для браузера
-	http_proxy = Thread(target = web_proxy)
-	http_proxy.start()
-
 	# Стартуем интерфейс
 	system('python srv_interface.py')
 

web_proxy.py

@@ -1,69 +0,0 @@
-import http.server
-import socketserver
-import urllib.request
-import logging
-
-from db import *
-domain = read()['domain']
-
-# Логирование
-#logging.basicConfig(level=ic, format='%(asctime)s - %(message)s')
-from icecream import ic
-ic.disable() # Выключить отладку
-
-class Proxy(http.server.SimpleHTTPRequestHandler):
-	def do_GET(self):
-		# Log the requested domain
-		ic(f"Request for: {self.path}")
-
-		# 'js-check.jet/favicon.ico' -> '127.0.0.1:8000/favicon.ico'
-		target = self.path
-		# Если статичный
-		if 'jet' in target:
-			target = f'{domain}/{target[7:]}' # http://127.0.0.1:8000 / js-check.jet
-			ic(f"Modded request: {target}")
-		elif 'dyn' in target:
-			addr = target[target.find('://')+3:]
-			addr = addr[:addr.find('/')]
-			port = read(f'cached/{addr}/config.json')['port']
-			target = f'http://bore.del.pw:{port}/{target[target.find("dyn")+4:]}'
-			ic(f"Modded request: {target}")
-
-		# Forward the request to the actual server
-		try:
-			with urllib.request.urlopen(target) as response:
-				self.send_response(response.getcode())
-				self.send_header("Content-type", response.headers.get_content_type())
-				self.end_headers()
-				self.wfile.write(response.read())
-		except Exception as e:
-			self.send_error(500, f"Error: {str(e)}")
-
-	def do_POST(self):
-		# Log the requested domain
-		ic(f"Request for: {self.path}")
-
-		if 'jet' in target:
-			target = f'{domain}/{target[7:]}' # http://127.0.0.1:8000 / js-check.jet
-			ic(f"Modded request: {target}")
-		else:
-			pass
-
-		# Forward the request to the actual server
-		try:
-			content_length = int(self.headers['Content-Length'])
-			post_data = self.rfile.read(content_length)
-			req = urllib.request.Request(self.path, data=post_data, method='POST')
-			with urllib.request.urlopen(req) as response:
-				self.send_response(response.getcode())
-				self.send_header("Content-type", response.headers.get_content_type())
-				self.end_headers()
-				self.wfile.write(response.read())
-		except Exception as e:
-			self.send_error(500, f"Error: {str(e)}")
-
-def web_proxy():
-	PORT = 8080
-	with socketserver.TCPServer(("", PORT), Proxy) as httpd:
-		ic(f"Serving on port {PORT}")
-		httpd.serve_forever()

web_proxy.py.bak

@@ -1,71 +0,0 @@
-import http.server
-import socketserver
-import urllib.request
-import logging
-
-from db import *
-domain = read()['domain']
-
-# Логирование
-#logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(message)s')
-from icecream import ic
-
-class Proxy(http.server.SimpleHTTPRequestHandler):
-	def do_GET(self):
-		# Log the requested domain
-		logging.info(f"Request for: {self.path}")
-
-		# 'js-check.jet/favicon.ico' -> '127.0.0.1:8000/favicon.ico'
-		target = self.path
-		# Если статичный
-		if 'jet' in target:
-			target = f'{domain}/{target[7:]}' # http://127.0.0.1:8000 / js-check.jet
-			logging.info(f"Modded request: {target}")
-		elif 'dyn' in target:
-			addr = target[target.find('://')+3:]
-			addr = addr[:addr.find('/')]
-			port = read(f'cached/{addr}/config.json')['port']
-			target = f'http://bore.pub:{port}/{target[target.find("dyn")+4:]}'
-			logging.info(f"Modded request: {target}")
-
-		# Forward the request to the actual server
-		try:
-			with urllib.request.urlopen(target) as response:
-				self.send_response(response.getcode())
-				self.send_header("Content-type", response.headers.get_content_type())
-				self.end_headers()
-				self.wfile.write(response.read())
-		except Exception as e:
-			self.send_error(500, f"Error: {str(e)}")
-
-	def do_POST(self):
-		# Log the requested domain
-		logging.info(f"Request for: {self.path}")
-
-		if 'jet' in target:
-			target = f'{domain}/{target[7:]}' # http://127.0.0.1:8000 / js-check.jet
-			logging.info(f"Modded request: {target}")
-		else:
-			pass
-
-		# Forward the request to the actual server
-		try:
-			content_length = int(self.headers['Content-Length'])
-			post_data = self.rfile.read(content_length)
-			req = urllib.request.Request(self.path, data=post_data, method='POST')
-			with urllib.request.urlopen(req) as response:
-				self.send_response(response.getcode())
-				self.send_header("Content-type", response.headers.get_content_type())
-				self.end_headers()
-				self.wfile.write(response.read())
-		except Exception as e:
-			self.send_error(500, f"Error: {str(e)}")
-
-#if __name__ == "__main__":
-def web_proxy():
-	PORT = 8080
-	with socketserver.TCPServer(("", PORT), Proxy) as httpd:
-		logging.info(f"Serving on port {PORT}")
-		httpd.serve_forever()
-
-web_proxy()