template is out of the interface, added markdown and html sanitizers (wip)

octomode.py

@@ -1,20 +1,29 @@
-import flask
+import os
-from flask import request
+import json
+from flask import Flask, request, render_template, redirect
 from urllib.request import urlopen
 from urllib.parse import urlencode
-import json
-import os
-import pypandoc
-from jinja2 import Template
 
-APP = flask.Flask(__name__)
+# To sanitize Flask input fields
+from flask import escape
+
+# To sanitize Markdown input
+import markdown
+import bleach
+
+APP = Flask(__name__)
 APP.config.from_object("config.Config")
 
 # ---
 
-def get_pad_content(pad):
+def get_pad_content(pad_name, ext=""):
+	if ext:
+		pad_name = f'{ pad_name }{ ext }'
+
+	print(pad_name)
+
 	arguments = { 
-		'padID' : pad,
+		'padID' : pad_name,
 		'apikey' : APP.config['PAD_API_KEY']
 	}
 	api_call = 'getText'
@@ -27,7 +36,6 @@ def get_pad_content(pad):
 		api_call = 'getText'
 		response = json.load(urlopen(f"{ APP.config['PAD_API_URL'] }{ api_call }", data=urlencode(arguments).encode()))
 
-	# print(response)
 	content = response['data']['text']
 	return content
 
@@ -44,136 +52,121 @@ def create_pad_on_first_run(name, ext):
 	pads = all_pads()
 	pad = name+ext
 
-	if 'md' in ext:
+	if pad not in pads['data']['padIDs']:
-		default_template = 'templates/default.md'
-	elif 'css' in ext:
-		default_template = 'templates/default.css'
-	elif 'template' in ext:
-		default_template = 'templates/default-pandoc-template.html'
 
-	if 'template' in ext:
+		# Select default template
-		default_template = open(default_template).read()
+		if 'md' in ext:
-		jinja_template = Template(default_template)
+			default_template = 'templates/default.md'
-		default_template = jinja_template.render(name=name.strip())
+		elif 'css' in ext:
-	else:
+			default_template = 'templates/default.css'
 		default_template = open(default_template).read()
 
-	if pad not in pads['data']['padIDs']:
+		# Create pad and add the default template
 		arguments = { 
 			'padID' : pad,
 			'apikey' : APP.config['PAD_API_KEY'],
 			'text' : default_template
 		}
 		api_call = 'createPad'
-		response = json.load(urlopen(f"{ APP.config['PAD_API_URL'] }{ api_call }", data=urlencode(arguments).encode()))
+		json.load(urlopen(f"{ APP.config['PAD_API_URL'] }{ api_call }", data=urlencode(arguments).encode()))
+
+def md_to_html(md_pad_content):
+	# Convert Markdown to HTML
+	html = markdown.markdown(md_pad_content, extensions=['meta'])
+	
+	# Sanitize the Markdown
+	# html = bleach.clean(html)
 	
-def update_pad_contents(name, ext):
+	# Another way to Sanitize
-	# download the md pad + stylesheet + template pad
+	from markupsafe import Markup
-	pad_name = f'{ name }{ ext }'
+	html = Markup(html) # Maybe not safe enough?
-	pad_content = get_pad_content(pad_name)
 	
-	return pad_content
+	return html
+
+def get_md_metadata(md_pad_content):
+	# Read the metadata from the Markdown
+	md = markdown.Markdown(extensions=['meta'])
+	md.convert(md_pad_content)
+	metadata = md.Meta
+
+	return metadata
 
 # ---
 
 @APP.route('/', methods=['GET', 'POST'])
 def index():
-	name = request.values.get('name')
+	name = False
+	if request.values.get('name'):
+		name = escape(request.values.get('name')) # Returns a Markup() object, which is "None" when False
 	if name: 
 		# This is when the environment is "created"
 		# The pads are filled with the default templates (pad, stylesheet, template)
-		exts = ['.md', '.css', '.template']
+		exts = ['.md', '.css']
 		for ext in exts:
 			create_pad_on_first_run(name, ext)
-		return flask.redirect(f'/{ name }/')
+		return redirect(f'/{ name }/')
 	else:
-		return flask.render_template('start.html')
+		return render_template('start.html')
 
 @APP.route('/<name>/', methods=['GET'])
 def main(name):
-	# !!! Add a if/else here to check if the environment is "created" already
+	return redirect(f'/{ name }/pad/')
-	ext = '.md'
-	create_pad_on_first_run(name, ext)
-	return flask.render_template('pad.html', pad_url=APP.config['PAD_URL'], name=name.strip(), ext=ext)
 
 @APP.route('/<name>/pad/')
 def pad(name):
-	ext = '.md'
+	pad_name = f'{ name }.md'
-	create_pad_on_first_run(name, ext)
+	url = os.path.join(APP.config['PAD_URL'], pad_name)
-	return flask.render_template('pad.html', pad_url=APP.config['PAD_URL'], name=name.strip(), ext=ext)
+	return render_template('iframe.html', url=url, name=name.strip())
 
 @APP.route('/<name>/stylesheet/', methods=['GET'])
 def stylesheet(name):
-	ext = '.css'
+	pad_name = f'{ name }.css'
-	create_pad_on_first_run(name, ext)
+	url = os.path.join(APP.config['PAD_URL'], pad_name)
-	return flask.render_template('pad.html', pad_url=APP.config['PAD_URL'], name=name.strip(), ext=ext)
+	return render_template('iframe.html', url=url, name=name.strip())
-
+
-@APP.route('/<name>/template/', methods=['GET'])
+@APP.route('/<name>/html/')
-def template(name):
+def html(name):
-	ext = '.template'
+	path = os.path.join(f'/{ name }/', 'preview.html')
-	create_pad_on_first_run(name, ext)
+	return render_template('iframe.html', url=path, name=name.strip())
-	return flask.render_template('pad.html', pad_url=APP.config['PAD_URL'], name=name.strip(), ext=ext)
-
-# @APP.route('/<name>/html/')
-# def html(name):
-# 	# update pad contents
-# 	md, css, template = update_pad_contents(name)
-# 	# generate html page
-# 	pandoc_args = [
-# 		# '--css=static/print.css',
-# 		'--toc',
-# 		'--toc-depth=1',
-# 		'--template=templates/pandoc-template.html',
-# 		'--standalone'
-# 	]
-# 	html = pypandoc.convert_text(md, 'html', format='md', extra_args=pandoc_args)
-
-# 	return flask.render_template('html.html', html=html, name=name.strip())
 
 @APP.route('/<name>/pdf/')
 def pdf(name):
-	# In case the URL is edited directly with a new name
+	path = os.path.join(f'/{ name }/', 'pagedjs.html')
-	exts = ['.md', '.css', '.template']
+	return render_template('pdf.html', url=path, name=name.strip())
-	for ext in exts:
-		create_pad_on_first_run(name, ext)
 
-	return flask.render_template('pdf.html', name=name.strip())
+# //////////////////
+# RENDERED RESOURCES 
+# //////////////////
+# (These are not saved as a file on the server)
 
-# //////////////
+@APP.route('/<name>/stylesheet.css')
-# rendered resources (not saved as a file on the server)
-
-@APP.route('/<name>/print.css')
 def css(name):
-	css = update_pad_contents(name, '.css')
+	css = get_pad_content(name, '.css')
+	# Insert CSS sanitizer here.
 	
 	return css, 200, {'Content-Type': 'text/css; charset=utf-8'}
 
-@APP.route('/<name>/pandoc-template.html')
+@APP.route('/<name>/preview.html')
-def pandoc_template(name):
+def preview(name):
-	template = update_pad_contents(name, '.template')
+	# TO GENERATE THE PREVIEW WEBPAGE
+	md_pad_content = get_pad_content(name, ext='.md')
+	html = md_to_html(md_pad_content)
+	metadata = get_md_metadata(md_pad_content)
+	lang = metadata['language'][0]
 	
-	return template, 200, {'Content-Type': 'text/html; charset=utf-8'}
+	return render_template('preview.html', name=name.strip(), pad_content=html, lang=lang)
 
 @APP.route('/<name>/pagedjs.html')
 def pagedjs(name):
-	# update pad contents
+	# TO GENERATE THE PAGED.JS WEBPAGE
-	md = update_pad_contents(name, '.md')
+	md_pad_content = get_pad_content(name, ext='.md')
-	# generate html page with the pandoc template (with paged.js inserted in the header)
+	html = md_to_html(md_pad_content)
-	# the pandoc template is loaded dynamically from /<name>/pandoc-template.html
+	metadata = get_md_metadata(md_pad_content)
-	# Needs pandoc >2.2.2 for this!
+	lang = metadata['language'][0]
-	# https://github.com/jgm/pandoc/issues/5246
+	
-	pandoc_args = [
+	return render_template('pagedjs.html', name=name.strip(), pad_content=html, lang=lang)
-		'--toc',
-		'--toc-depth=1',
-		f'--template=http://localhost:5001/{ name }/pandoc-template.html',
-		'--standalone'
-	]
-	html = pypandoc.convert_text(md, 'html', format='md', extra_args=pandoc_args)
-
-	return html, 200, {'Content-Type': 'text/html; charset=utf-8'}
-
-# /////////////
 
+# //////////////////
 
 if __name__ == '__main__':
 	APP.debug=True