STRLCPY/wifi_db

■ ■ ■ ■ ■ ■

database_utils.py

		skipped 17 lines
18	18
19	19
20	20		def insertAP(cursor, verbose, bssid, essid, manuf, channel, freqmhz, carrier,
21		-	encryption, packets_total, lat, lon):
	21	+	encryption, packets_total, lat, lon, cloaked):
22	22		''''''
23	23		try:
24		-	cursor.execute('''INSERT INTO AP VALUES(?,?,?,?,?,?,?,?,?,?) ''',
	24	+	cursor.execute('''INSERT INTO AP VALUES(?,?,?,?,?,?,?,?,?,?,?) ''',
25	25		(bssid, essid, manuf, channel, freqmhz, carrier,
26		-	encryption, packets_total, lat, lon))
	26	+	encryption, packets_total, lat, lon, cloaked))
27	27		return int(0)
28	28		except sqlite3.IntegrityError as error:
29	29		# errors += 1
		skipped 49 lines
79	79		"ELSE lon_t END "
80	80		"WHERE bssid = '%s'" % (lat, lon, bssid))
81	81
	82	+	cursor.execute(
	83	+	"UPDATE AP SET cloaked = CASE WHEN cloaked == False THEN ('%s')"
	84	+	"ELSE cloaked END "
	85	+	"WHERE bssid = '%s'"
	86	+	% (cloaked, bssid))
82	87		return int(0)
83	88		except sqlite3.IntegrityError as error:
84	89
		skipped 353 lines

■ ■ ■ ■ ■ ■

view.sql

		skipped 9 lines
10	10
11	11
12	12		CREATE VIEW IF NOT EXISTS ProbeClientsConnected AS
13		-	SELECT ConnectedAP.bssid, ConnectedAP.ssid, Probe.mac, Client.manuf, Client.type, Client.packetsTotal, Probe.ssid
	13	+	SELECT ConnectedAP.bssid, ConnectedAP.ssid, Probe.mac, Client.manuf, Client.type, Client.packetsTotal, Probe.ssid as "Probe"
14	14		from Probe join Client on Probe.mac = Client.mac join ConnectedAP on Probe.mac = ConnectedAP.mac
	15	+	where ConnectedAP.ssid != Probe
15	16		ORDER BY Probe.ssid;
16	17
17	18		CREATE VIEW IF NOT EXISTS HandshakeAP AS
		skipped 11 lines
29	30		FROM Identity JOIN AP ON Identity.bssid = AP.bssid JOIN Client ON Identity.mac = Client.mac
30	31		ORDER BY Identity.bssid;
31	32
	33	+	CREATE VIEW IF NOT EXISTS SummaryAP AS
	34	+	SELECT ssid, count(ssid) AS "Count", AP.encryption, AP.manuf, AP,cloaked
	35	+	FROM AP group by ssid
	36	+	ORDER BY count(ssid) DESC;
	37	+

■ ■ ■ ■ ■ ■

wifi_db_aircrack.py

		skipped 9 lines
10	10		import database_utils
11	11		import pyshark
12	12		import subprocess
	13	+	import platform
13	14
14	15
15	16		def parse_netxml(ouiMap, name, database, verbose):
		skipped 54 lines
70	71		else:
71	72		essid = ""
72	73
	74	+	cloakedtxt = wireless.find("SSID").find("essid").attrib['cloaked']
	75	+	# print("cloaked: " + cloakedtxt)
	76	+	if cloakedtxt == "true":
	77	+	cloaked = 1 # ftfy.fix_text(cloaked)
	78	+	# print(essid)
	79	+	else:
	80	+	cloaked = 0
	81	+
73	82		bssid = wireless.find("BSSID").text
74	83		# manuf = wireless.find("manuf").text
75	84		channel = wireless.find("channel").text
		skipped 24 lines
100	109
101	110		errors += database_utils.insertAP(
102	111		cursor, verbose, bssid, essid, manuf, channel,
103		-	freqmhz, carrier, encryption, packets_total, lat, lon)
	112	+	freqmhz, carrier, encryption, packets_total, lat, lon,
	113	+	cloaked)
104	114
105	115		# client
106	116		clients = wireless.findall("wireless-client")
		skipped 47 lines
154	164		packets_total = row[16]
155	165		lat = row[32]
156	166		lon = row[33]
157		-
	167	+	cloaked = False
158	168		errors += database_utils.insertAP(
159	169		cursor, verbose, bssid, essid, manuf, channel,
160	170		freqmhz, carrier, encryption, packets_total,
161		-	lat, lon)
	171	+	lat, lon, cloaked)
162	172		# manuf y carrier implementar
163	173		except Exception as error:
164	174		if verbose:
		skipped 34 lines
199	209		carrier = ""
200	210		encrypt = row[5] + row[6] + row[7]
201	211		packets_total = row[10]
	212	+	cloaked = False
202	213
203	214		errors += database_utils.insertAP(
204	215		cursor, verbose, bssid, essid[1:], manuf,
205	216		channel, freq, carrier, encrypt,
206		-	packets_total, 0, 0)
	217	+	packets_total, 0, 0, cloaked)
207	218
208	219		if row and row[0] == "Station MAC":
209	220		client = True
		skipped 63 lines
273	284		if fake_lon != "":
274	285		lon = fake_lon
275	286		manuf = oui.get_vendor(ouiMap, row[3])
	287	+	cloaked = False
276	288		errors += database_utils.insertAP(
277	289		cursor, verbose, row[3], row[2],
278		-	manuf, 0, 0, '', '', 0, lat, lon)
	290	+	manuf, 0, 0, '', '', 0, lat, lon,
	291	+	cloaked)
279	292
280	293		# if row[6] != "0.000000":
281	294		errors += database_utils.insertSeenAP(
		skipped 208 lines

■ ■ ■ ■ ■ ■

wifi_db_database.sql

		skipped 1 lines
2	2		(
3	3		bssid TEXT NOT NULL,
4	4		ssid TEXT,
	5	+	cloaked BOOLEAN,
5	6		manuf TEXT,
6	7		channel int,
7	8		frequency int,
		skipped 104 lines

Flag if ESSID cloaked, add Summary view