D4
/
d4-core
mirror of https://github.com/D4-project/d4-core
2
0
Fork 0
Code Issues Releases Wiki Activity

chg: [install] create default user + add mail to sensor registration

pull/24/head
Terrtia 2019-08-20 16:05:27 +02:00
parent 3630ec0460
commit 450f5860e4
No known key found for this signature in database
GPG Key ID: 1E1B1F50D84613D0
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/install_server.sh
View File

@ -25,3 +25,7 @@ pushd redis/
git checkout 5.0 git checkout 5.0
make make
popd popd
pushd web/
./create_default_user.py
popd

3
server/lib/Sensor.py
View File

@ -25,6 +25,7 @@ def is_valid_uuid_v4(UUID):
def register_sensor(req_dict): def register_sensor(req_dict):
sensor_uuid = req_dict.get('uuid', None) sensor_uuid = req_dict.get('uuid', None)
hmac_key = req_dict.get('hmac_key', None) hmac_key = req_dict.get('hmac_key', None)
user_id = req_dict.get('mail', None)
# verify uuid # verify uuid
if not is_valid_uuid_v4(sensor_uuid): if not is_valid_uuid_v4(sensor_uuid):
return ({"status": "error", "reason": "Invalid uuid"}, 400) return ({"status": "error", "reason": "Invalid uuid"}, 400)
@ -33,8 +34,6 @@ def register_sensor(req_dict):
if r_serv_db.exists('metadata_uuid:{}'.format(sensor_uuid)): if r_serv_db.exists('metadata_uuid:{}'.format(sensor_uuid)):
return ({"status": "error", "reason": "Sensor already registred"}, 409) return ({"status": "error", "reason": "Sensor already registred"}, 409)
user_id = req_dict.get('uuid', None)
res = _register_sensor(sensor_uuid, hmac_key, user_id=user_id, description=None) res = _register_sensor(sensor_uuid, hmac_key, user_id=user_id, description=None)
return res return res