+
+- `OAUTH2_REDIRECT_URI` - This will be equal to the url of your log viewer app + `/callback` e.g. `https://logwebsite.com/callback`. You will need to add this same url as a redirect url in the oauth2 section in the discord dev portal.
+
+
+Now you need to set up users or roles to whitelist access to your logs, do this via the `?oauth whitelist @user/role` command on your modmail bot.
+
+This should enable whitelisted users to view logs while anyone else trying to access them will be rejected,
+
## Contributing
If you can make improvements in the design and presentation of logs, please make a pull request with changes.
diff --git a/app.py b/app.py
index e60adcf..feb0cfd 100644
--- a/app.py
+++ b/app.py
@@ -1,74 +1,176 @@
import os
+from functools import wraps
+from urllib.parse import urlencode, urlparse
-from sanic import Sanic, response
from motor.motor_asyncio import AsyncIOMotorClient
+from sanic import Sanic, response
+from sanic.exceptions import abort, NotFound, Unauthorized
+from sanic_session import Session, InMemorySessionInterface
from jinja2 import Environment, PackageLoader
-from objects import LogEntry
+import aiohttp
+
+from core.models import LogEntry
+from core.utils import get_stack_variable, authrequired, User
+
+OAUTH2_CLIENT_ID = os.getenv('OAUTH2_CLIENT_ID')
+OAUTH2_CLIENT_SECRET = os.getenv('OAUTH2_CLIENT_SECRET')
+OAUTH2_REDIRECT_URI = os.getenv('OAUTH2_REDIRECT_URI')
+API_BASE = 'https://discordapp.com/api/'
+AUTHORIZATION_BASE_URL = API_BASE + '/oauth2/authorize'
+TOKEN_URL = API_BASE + '/oauth2/token'
+ROLE_URL = API_BASE + '/guilds/{guild_id}/members/{user_id}'
+
+prefix = os.getenv('URL_PREFIX', '/logs')
+if prefix == 'NONE':
+ prefix = ''
app = Sanic(__name__)
+app.using_oauth = (OAUTH2_CLIENT_ID and OAUTH2_CLIENT_SECRET)
+app.bot_id = OAUTH2_CLIENT_ID
+Session(app, interface=InMemorySessionInterface())
app.static('/static', './static')
jinja_env = Environment(loader=PackageLoader('app', 'templates'))
-
-# def is_image_url(u):
-# image_types = ['.png', '.jpg', '.gif', '.jpeg', '.webp']
-# return any(urlparse(u.lower()).path.endswith(x) for x in image_types)
-#
-
def render_template(name, *args, **kwargs):
template = jinja_env.get_template(name + '.html')
+ request = get_stack_variable('request')
+ if request:
+ kwargs['request'] = request
+ kwargs['session'] = request['session']
+ kwargs['user'] = request['session'].get('user')
kwargs.update(globals())
return response.html(template.render(*args, **kwargs))
-
app.render_template = render_template
-
@app.listener('before_server_start')
async def init(app, loop):
app.db = AsyncIOMotorClient(os.getenv('MONGO_URI')).modmail_bot
-
-
+ app.session = aiohttp.ClientSession(loop=loop)
+ if app.using_oauth:
+ app.guild_id = os.getenv('GUILD_ID')
+ app.bot_token = os.getenv('TOKEN')
+ app.netloc = urlparse(OAUTH2_REDIRECT_URI).netloc
+ print('USING OAUTH2 MODE')
+
+async def fetch_token(code):
+ data = {
+ "code": code,
+ "grant_type": "authorization_code",
+ "redirect_uri": OAUTH2_REDIRECT_URI,
+ "client_id": OAUTH2_CLIENT_ID,
+ "client_secret": OAUTH2_CLIENT_SECRET,
+ "scope": "identify"
+ }
+
+ headers = {'Content-Type': 'x-www-form-urlencoded'}
+
+ async with app.session.post(TOKEN_URL, data=data) as resp:
+ json = await resp.json()
+ return json
+
+async def get_user_info(token):
+ headers = {"Authorization": f"Bearer {token}"}
+ async with app.session.get(f"{API_BASE}/users/@me", headers=headers) as resp:
+ return await resp.json()
+
+async def get_user_roles(user_id):
+ url = ROLE_URL.format(guild_id=app.guild_id, user_id=user_id)
+ headers = {'Authorization': f'Bot {app.bot_token}'}
+ async with app.session.get(url, headers=headers) as resp:
+ user = await resp.json()
+ return user.get('roles', [])
+
+app.get_user_roles = get_user_roles
+
+@app.exception(NotFound)
+async def not_found(request, exc):
+ return render_template('not_found')
+
+@app.exception(Unauthorized)
+async def not_authorized(request, exc):
+ return render_template(
+ 'unauthorized',
+ message='You do not have permission to view this page.'
+ )
@app.get('/')
async def index(request):
- return response.text('Welcome! This simple website is '
- 'used to display your Modmail logs.')
-
-
-@app.get('/logs/raw/
- 
@@ -45,7 +46,7 @@
@@ -56,7 +57,7 @@
{% for group in log_entry.message_groups %}
-
+
+
+
+ Logout
+
+
+
+
+
+
+
diff --git a/templates/not_found.html b/templates/not_found.html
new file mode 100644
index 0000000..0fb4663
--- /dev/null
+++ b/templates/not_found.html
@@ -0,0 +1,16 @@
+{% extends "base.html" %}
+{% block content %}
+
+
+
+
+
+{% endblock %}
\ No newline at end of file
diff --git a/templates/unauthorized.html b/templates/unauthorized.html
new file mode 100644
index 0000000..b3cee7e
--- /dev/null
+++ b/templates/unauthorized.html
@@ -0,0 +1,16 @@
+{% extends "base.html" %}
+{% block content %}
+
+
+
+
+
+{% endblock %}
\ No newline at end of file
+
+
+
+
+
+Not found
+The page you are looking for is not here.
++
+
+
+
+
+
+Unauthorized
+{{ message }}
++