aljaz/CTFd
1
0
Fork 0
mirror of https://github.com/aljazceru/CTFd.git synced 2025-12-19 06:54:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Closes #136

Browse Source
This commit is contained in:
Kevin Chung
2016-08-09 17:19:05 -04:00
parent afbd4b5f8a
commit a4e51fcc76
1 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
CTFd/utils.py
View File

@@ -1,4 +1,4 @@
from CTFd.models import db, WrongKeys, Pages, Config, Tracking, Teams, Containers from CTFd.models import db, WrongKeys, Pages, Config, Tracking, Teams, Containers, ip2long, long2ip
from six.moves.urllib.parse import urlparse, urljoin from six.moves.urllib.parse import urlparse, urljoin
from werkzeug.utils import secure_filename from werkzeug.utils import secure_filename
@@ -6,7 +6,7 @@ from functools import wraps
from flask import current_app as app, g, request, redirect, url_for, session, render_template, abort from flask import current_app as app, g, request, redirect, url_for, session, render_template, abort
from itsdangerous import Signer, BadSignature from itsdangerous import Signer, BadSignature
from socket import inet_aton, inet_ntoa, socket from socket import inet_aton, inet_ntoa, socket
from struct import unpack, pack from struct import unpack, pack, error
from sqlalchemy.engine.url import make_url from sqlalchemy.engine.url import make_url
from sqlalchemy import create_engine from sqlalchemy import create_engine
@@ -272,14 +272,6 @@ def get_ip():
return remote_addr return remote_addr
def long2ip(ip_int):
return inet_ntoa(pack('!I', ip_int))
def ip2long(ip):
return unpack('!I', inet_aton(ip))[0]
def get_kpm(teamid): # keys per minute def get_kpm(teamid): # keys per minute
one_min_ago = datetime.datetime.utcnow() + datetime.timedelta(minutes=-1) one_min_ago = datetime.datetime.utcnow() + datetime.timedelta(minutes=-1)
return len(db.session.query(WrongKeys).filter(WrongKeys.teamid == teamid, WrongKeys.date >= one_min_ago).all()) return len(db.session.query(WrongKeys).filter(WrongKeys.teamid == teamid, WrongKeys.date >= one_min_ago).all())