FVDE/ennstatus Changeset - 3ec5be85acb4 · Chaos Computer Club Lëtzebuerg Projects

Changeset - 3ec5be85acb4

Parent rev.

Child rev.

[Not reviewed]

version_5

0 1 0

Dennis Fink - 10 years ago 2015-08-30 15:23:39
dennis.fink@c3l.lu

Use try except block for checking if we got json

1 file changed with 5 insertions and 3 deletions:

ennstatus/api/views.py

0 comments (0 inline, 0 general)

ennstatus/api/views.py

➞

Show inline comments

@@ @@ -2,12 +2,14 @@ import ipaddress @@
 from datetime import datetime
 from flask import (Blueprint, request, current_app, jsonify, render_template,
                    abort)
 from werkzeug.exceptions import BadRequest
 import strict_rfc3339
 import pygeoip
 from ennstatus.status.functions import (single_server, all_servers,
                                         all_servers_by_type)
 from .model import Server
@@ @@ -41,15 +43,15 @@ def update(): @@
+            )
             return 'IP not allowed!\n', 403, {'Content-Type': 'text/plain'}
     except KeyError as e:
         current_app.logger.error(str(e))
         return abort(500)
     data = request.get_json()
     if data is None:
     try:
         data = request.get_json()
     except BadRequest:
         current_app.logger.info('No JSON data supplied!')
         return 'No JSON data supplied!\n', 400, {'Content-Type': 'text/plain'}
     try:
         if username != data['name'].lower():
             current_app.logger.warn(

0 comments (0 inline, 0 general)