Skip to content

Commit fa70d79

Browse files
committed
20200825 - JWT token expiration
1 parent b5c0180 commit fa70d79

File tree

5 files changed

+15
-3
lines changed

5 files changed

+15
-3
lines changed

MANIFEST.in

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
global-exclude *.pyc

app/__init__.py

+2
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
from flask import Flask, jsonify
66
from flask_jwt_extended import JWTManager
77
from flask_cors import CORS
8+
from datetime import timedelta;
89
from .resources.errors import KeyperError
910
from .utils.extensions import jwt, logs, ma
1011
from config import config
@@ -24,6 +25,7 @@ def create_app():
2425
app.logger.debug("flask_config: " + flask_config)
2526

2627
jwt.init_app(app)
28+
#app.config['JWT_ACCESS_TOKEN_EXPIRES'] = timedelta(seconds=60)
2729

2830
ma.init_app(app)
2931

app/admin/hosts.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -230,8 +230,8 @@ def searchHosts(con, searchFilter):
230230

231231
class HostCreateSchema(Schema):
232232
cn = fields.Str(required=True, validate=Length(max=100))
233-
description = fields.Str(required=False, validate=Length(max=1000))
234-
owners = fields.List(fields.Str(validate=Length(max=200)), required=False)
233+
description = fields.Str(required=False, validate=Length(max=1000), allow_none=True)
234+
owners = fields.List(fields.Str(required=False, validate=Length(max=200)))
235235

236236
class Meta:
237237
fields = ("cn", "owners", "description")

app/admin/users.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,8 @@ def search_users(con, searchFilter):
317317
app.logger.debug(key.decode())
318318
sshPublicKey = json.loads(key.decode())
319319
sshPublicKeys.append(sshPublicKey)
320-
user["sshPublicKeys"] = sshPublicKeys
320+
321+
user["sshPublicKeys"] = sshPublicKeys
321322

322323
list.append(user)
323324
except ldap.LDAPError:

setup.py

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
''' Setup file for installation '''
2+
from setuptools import find_packages, setup
3+
4+
setup(
5+
name='keyper',
6+
version='0.0.1',
7+
packages=find_packages(),
8+
)

0 commit comments

Comments
 (0)