From aadd3670768f554aac33729a1dc8d0138bf911a7 Mon Sep 17 00:00:00 2001 From: Rich Date: Wed, 1 Sep 2021 10:34:11 +0100 Subject: [PATCH] . --- app.db | Bin 36864 -> 36864 bytes app/models.py | 24 ++++++++++++------------ app/network_utils.py | 4 ++++ app/routes2.py | 2 +- 4 files changed, 17 insertions(+), 13 deletions(-) diff --git a/app.db b/app.db index 486c52e4113ca5928cde076d52083f5db1e9eb3a..d7324c596bb59896590be594dbe4d380f7418fe7 100644 GIT binary patch delta 141 zcmZozz|^pSX@az%2m=EHClGT0F*6WzP1G@#6=Bdbu;S(a!NAIUh=HG%eA4Oo1fx%|Rg8%#z X12{ODfL5>rF(+7Lvp~TIentiWbmAfn delta 450 zcmZozz|^pSX@az%AOiyfClGT0F(ZhcsADWE$e?Fn#mlpvft^Q&fuEOuCto(7H18o^ zeI6MenazR%3%KhW1vuEnRaF@qlS>kla#EA?^U^ZY<1yHr&Oxq@A+8D`j!r(V3dpJy zG`Ki3QxrV?LR{TlgB1MyLlpc%eSCBjxHz*F!W@H~Jsg8H3=Ir4K_X>HB1XnQAqg(d zfFMs_$Dl|BZ`Vi#jm#8HE=~R)3=I<-Yk+QJV;7f~XKc&|yQd(rxVSvOD5V(AU`KHk zTo{j&ii?46g}cfG;wqR%goKd=&~1}{@`-Fd#A_tPV`!RYmSmc0ZfKrjuu0(yKZ?L2 z0|PEzP^j~NV&MO@nK9u7KOYYx3xlX=NNRCO2@o%4Ob}q?-OT9lj$e=;D5J>lotcvp LT%K8yoM8X}pGbHw diff --git a/app/models.py b/app/models.py index 127666a..b0a3cc3 100644 --- a/app/models.py +++ b/app/models.py @@ -27,19 +27,19 @@ def load_user(user_id): return User.query.get(int(user_id)) -class Passwords(db.Model): - id = db.Column(db.Integer, primary_key=True) - ssid = db.Column(db.String(140)) - password = db.Column(db.String(128)) +# class Passwords(db.Model): +# id = db.Column(db.Integer, primary_key=True) +# ssid = db.Column(db.String(140)) +# password = db.Column(db.String(128)) - def __repr__(self): - return "".format(self.ssid) +# def __repr__(self): +# return "".format(self.ssid) -class ConfigTable(db.Model): - id = db.Column(db.Integer, primary_key=True) - k = db.Column(db.String(100)) - v = db.Column(db.String(1023)) +# class ConfigTable(db.Model): +# id = db.Column(db.Integer, primary_key=True) +# k = db.Column(db.String(100)) +# v = db.Column(db.String(1023)) - def __repr__(self): - return "".format(self.k, self.v) +# def __repr__(self): +# return "".format(self.k, self.v) diff --git a/app/network_utils.py b/app/network_utils.py index 378c825..26339e5 100644 --- a/app/network_utils.py +++ b/app/network_utils.py @@ -76,6 +76,8 @@ def parse_iwlist(iwlist_output, current_sid): if line.find("ESSID:") != -1: if line.partition("ESSID:")[2].strip('"') != "": cell["SSID"] = line.partition("ESSID:")[2].strip('"') + else: + cell["SSID"] = "!***!" if cell["SSID"] == current_sid: cell["Connected"] = "Yes" else: @@ -92,6 +94,8 @@ def parse_iwlist(iwlist_output, current_sid): except: cells = [] + cells = [cell for cell in cells if cell["SSID"] != "!***!"] + return cells diff --git a/app/routes2.py b/app/routes2.py index 5b83e5b..759b1db 100644 --- a/app/routes2.py +++ b/app/routes2.py @@ -3,7 +3,7 @@ from flask_login import current_user, login_required, login_user, logout_user from app import app from app.forms import LoginForm, WPAForm -from app.models import ConfigTable, Passwords, User +from app.models import User from app.network_utils import ( connect_network, disconnect_network,