Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev #45

Draft
wants to merge 75 commits into
base: master
Choose a base branch
from
Draft

Dev #45

Changes from 1 commit
Commits
Show all changes
75 commits
Select commit Hold shift + click to select a range
7e5c314
v1.5 dev
r4ulcl Oct 13, 2023
0952e1e
Minor flake8 changes
r4ulcl Oct 13, 2023
a648eea
codecov workflow
r4ulcl Oct 13, 2023
d63b79d
Fix name
r4ulcl Oct 13, 2023
1ca6a36
Remove old function, update unit_test
r4ulcl Oct 13, 2023
cbb462b
Test with real data
r4ulcl Oct 21, 2023
0d42b6c
Add verbose to get_vendor
r4ulcl Oct 21, 2023
09e987d
Add branch to test real data
r4ulcl Oct 21, 2023
25a9fed
Merge pull request #30 from r4ulcl/dev
r4ulcl Oct 21, 2023
4358eda
Install pytest, remove test db
r4ulcl Oct 21, 2023
b8a1b18
Add test using real data, docker compile hcxtools
r4ulcl Oct 22, 2023
44c0abf
Fix alert banner
r4ulcl Oct 22, 2023
e087a91
Use specific hcxtools version, fix dev docker CICD
r4ulcl Oct 22, 2023
defca06
Install dependencies if updated
r4ulcl Oct 22, 2023
1811c2e
Fix hcxpcapngtool error
r4ulcl Oct 22, 2023
7b1723b
Add unit test for handshake, fix hashcat enter
r4ulcl Oct 22, 2023
ebc7a84
Add check after insert data in unit test
r4ulcl Oct 22, 2023
cf850fd
Merge pull request #31 from r4ulcl/Test-with-real-data
r4ulcl Oct 22, 2023
cfaa19e
Merge branch 'dev' of https://github.com/r4ulcl/wifi_db into dev
r4ulcl Oct 22, 2023
8616a08
Fix double subprocess
r4ulcl Oct 22, 2023
890b277
Set full hcxpcapngtool path
r4ulcl Oct 22, 2023
2b4442f
set full path python3
r4ulcl Oct 22, 2023
c86f65d
Hide hcxpcapngtool output
r4ulcl Oct 22, 2023
5b35f30
Dont exit if no git installed
r4ulcl Oct 22, 2023
7a1dee5
Docker fix
r4ulcl Oct 22, 2023
fb2823e
Flake8 fixes
r4ulcl Oct 22, 2023
f6bcbdd
Fix handshake test error?
r4ulcl Oct 22, 2023
7026bf9
Install using venv README, fix 'unsecure' unittest
r4ulcl Oct 23, 2023
4c1fbb7
Bump ftfy from 6.1.1 to 6.1.3
dependabot[bot] Nov 27, 2023
14af622
Merge pull request #32 from r4ulcl/dependabot/pip/ftfy-6.1.3
r4ulcl Nov 27, 2023
afd392e
Test GitHub Container Registryin dev
r4ulcl Dec 2, 2023
c5d0de3
add username
r4ulcl Dec 2, 2023
ba37ddf
Test dev new mode
r4ulcl Dec 2, 2023
1208989
Fix dev workflow tabs
r4ulcl Dec 2, 2023
7d577b6
Bump ftfy from 6.1.1 to 6.1.3
dependabot[bot] Dec 4, 2023
5773280
ghcr.io docker
r4ulcl Dec 6, 2023
e5bc123
Test main GitHub Packages
r4ulcl Dec 6, 2023
2c61c9b
Merge pull request #33 from r4ulcl/dependabot/pip/ftfy-6.1.3
r4ulcl Dec 6, 2023
c7853b2
Test Publish to Registry
r4ulcl Dec 6, 2023
047ebb8
test 2
r4ulcl Dec 6, 2023
38f279d
test 3
r4ulcl Dec 6, 2023
7f64c59
test 4
r4ulcl Dec 6, 2023
af6b615
test 4 fix indent
r4ulcl Dec 6, 2023
691e9d0
test 5
r4ulcl Dec 6, 2023
403aacb
test Get latest tag
r4ulcl Dec 6, 2023
2fab47c
test Fetch Tags
r4ulcl Dec 6, 2023
d12f00f
Build and push Docker image test
r4ulcl Dec 6, 2023
234e911
Only latest, not version
r4ulcl Dec 6, 2023
dc17368
docker/build-push-action
r4ulcl Dec 6, 2023
22de272
Fix id
r4ulcl Dec 6, 2023
63ec296
Add is_git_repo before try to update
r4ulcl Dec 10, 2023
d402669
Fix is_git_repo
r4ulcl Dec 11, 2023
b8fc6de
Remove false cloaked
r4ulcl Dec 11, 2023
f198aff
Update workflows, dev and master
r4ulcl Dec 12, 2023
4198953
style=flat in README
r4ulcl Feb 9, 2024
c7743cb
Fix dev github.actor
r4ulcl Feb 9, 2024
b7e5bb0
v5
r4ulcl Feb 9, 2024
110a8de
Fix Docker Image Dev errors
r4ulcl Feb 9, 2024
3f24fa0
Fix file path
r4ulcl Feb 9, 2024
9d34e91
Update workflow master
r4ulcl Feb 9, 2024
b0d91a9
Test all platforms
r4ulcl Feb 9, 2024
4478133
platforms amd64 and arm
r4ulcl Feb 9, 2024
3ccc158
Remove linux/arm/v7
r4ulcl Feb 9, 2024
5894a59
platforms: linux/amd64,linux/arm64 in pro
r4ulcl Feb 9, 2024
6398165
Bump ftfy from 6.1.1 to 6.1.3
r4ulcl Feb 10, 2024
8bfe80e
Add timeout=5 in requests.get
r4ulcl Mar 8, 2024
64a52c0
Update Dockerfile, use no install recommends and replace cd with work…
r4ulcl Mar 9, 2024
7a938d3
Version to 1.5.1
r4ulcl Mar 9, 2024
a1e206f
Merge branch 'master' into dev
r4ulcl Mar 9, 2024
6127408
Set pip==20.0.2
r4ulcl Mar 9, 2024
1723dd4
Test github.repository to generic workflow
r4ulcl Mar 9, 2024
65ddf97
Bump pytest from 7.4.2 to 8.1.1
dependabot[bot] Mar 11, 2024
967b44e
Bump ftfy from 6.1.3 to 6.2.0
dependabot[bot] Mar 18, 2024
1ba4cc3
Update requirements.txt
r4ulcl Aug 25, 2024
58e9f19
Update WiFiChallenge Lab URL
r4ulcl Nov 29, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Minor flake8 changes
  • Loading branch information
r4ulcl committed Oct 13, 2023
commit 0952e1e546aca25059087eba8b5a06547a05ea0b
6 changes: 3 additions & 3 deletions utils/database_utils.py
Original file line number Diff line number Diff line change
@@ -553,7 +553,7 @@ def checkFileProcessed(cursor, verbose, file):
hash = getHash(file_handle.read())

try:
cursor.execute('''SELECT file FROM Files WHERE hashSHA = (?)
cursor.execute('''SELECT file FROM Files WHERE hashSHA = (?)
AND processed = "True"''', (hash,))

output = cursor.fetchall()
@@ -642,8 +642,8 @@ def clearWhitelist(database, verbose, whitelist):
cursor.execute(
"DELETE from Probe where mac = (?) ", (mac.upper(),))
cursor.execute(
"DELETE from Connected where bssid = (?) OR mac = (?) "
, (mac.upper(), mac.upper(),))
"DELETE from Connected where bssid = (?) OR mac = (?) ",
(mac.upper(), mac.upper(),))
cursor.execute(
"DELETE from AP where bssid = (?) ", (mac.upper(),))
cursor.execute(
2 changes: 1 addition & 1 deletion utils/wifi_db_aircrack.py
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
''' Parse Aircrack, Kismet and Wigle output to a SQLite DB '''
# -*- coding: utf-8 -*-
import csv
#import xml.etree.ElementTree as ET # vuln!
# import xml.etree.ElementTree as ET # vuln!
import defusedxml.ElementTree as ET
import os
import re