diff --git a/CTFd/utils.py b/CTFd/utils.py index 74ab1cad..05ef4eeb 100644 --- a/CTFd/utils.py +++ b/CTFd/utils.py @@ -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 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 itsdangerous import Signer, BadSignature 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 import create_engine @@ -272,14 +272,6 @@ def get_ip(): 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 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())