Skip to content

A WiFi security auditing software

feat: version 0.6.0 (#46)

Martin Oliviere254467d4bb4
diff --git a/.fpm b/.fpm
index 1f6ef46..ee362c0 100644
--- a/.fpm
+++ b/.fpm
@@ -1,7 +1,7 @@
-s dir ./target/release/airgorah ./icons/app_icon.png package README.md LICENSE
--name airgorah
--license MIT
---version 0.5.0
+--version 0.6.0
--description "A WiFi auditing software that can perform deauth attacks and passwords cracking"
--url "https://github.com/martin-olivier/airgorah"
--maintainer "Martin Olivier <[email protected]>"
@@ -15,6 +15,7 @@
--depends iw
--depends macchanger
--depends aircrack-ng
+--depends adwaita-icon-theme
target/release/airgorah=/usr/bin/airgorah
icons/app_icon.png=/usr/share/pixmaps/airgorah.png
diff --git a/.github/assets/illustration.png b/.github/assets/illustration.png
index 6290ccd..583533c 100755
Binary files a/.github/assets/illustration.png and b/.github/assets/illustration.png differ
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index df22b53..0fb9d59 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -4,21 +4,9 @@ on:
push:
branches:
- main
- paths:
- - src/*
- - icons/*
- - package/*
- - .github/workflows/*.yml
- - Cargo.toml
pull_request:
branches:
- main
- paths:
- - src/*
- - icons/*
- - package/*
- - .github/workflows/*.yml
- - Cargo.toml
release:
types: [published]
@@ -27,7 +15,7 @@ jobs:
name: commits
runs-on: ubuntu-latest
steps:
- - uses: actions/checkout@v3
+ - uses: actions/checkout@v4
- uses: webiny/[email protected]
linter:
@@ -35,7 +23,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- - uses: actions/checkout@v3
+ - uses: actions/checkout@v4
- name: Install dependencies
run: sudo apt update && sudo apt install -y libgtk-4-dev libglib2.0-dev
@@ -50,36 +38,50 @@ jobs:
strategy:
fail-fast: false
matrix:
- os: [ubuntu-latest, ubuntu-latest-arm64]
+ arch: [x86_64, aarch64]
include:
- - os: ubuntu-latest
- arch: x86_64
- - os: ubuntu-latest-arm64
- arch: aarch64
+ - arch: x86_64
+ platform: amd64
+ image: amd64_builder
+ - arch: aarch64
+ platform: arm64
+ image: arm64_builder
name: build ${{ matrix.arch }}
- runs-on: ${{ matrix.os }}
+ runs-on: ubuntu-latest
needs: linter
permissions: write-all
steps:
- - uses: actions/checkout@v3
+ - uses: actions/checkout@v4
- uses: actions/cache@v3
with:
- path: |
- ~/.cargo/bin/
- ~/.cargo/registry/index/
- ~/.cargo/registry/cache/
- ~/.cargo/git/db/
- target/
- key: linux_${{ matrix.arch }}-cargo-${{ hashFiles('**/Cargo.lock') }}
- restore-keys: linux_${{ matrix.arch }}-cargo-
+ path: /var/lib/docker
+ key: docker-${{ matrix.arch }}-${{ hashFiles('**/Dockerfile') }}
+ restore-keys: docker-${{ matrix.arch }}-
- - name: Install dependencies
+ - name: Set up qemu
+ uses: docker/setup-qemu-action@v3
+
+ - name: Create builder image
+ run: >
+ docker build .
+ --platform linux/${{ matrix.platform }}
+ -t ${{ matrix.image }}
+ -f docker/${{ matrix.image }}/Dockerfile
+
+ - name: Build project
+ run: >
+ docker run --rm
+ --platform linux/${{ matrix.platform }}
+ -v ${{ github.workspace }}:/workspace
+ -w /workspace
+ ${{ matrix.image }}
+ cargo build --release
+
+ - name: Install packaging dependencies
run: >
sudo apt update && sudo apt install -y
- libgtk-4-dev
- libglib2.0-dev
build-essential
ruby
ruby-dev
@@ -90,12 +92,9 @@ jobs:
- name: Install fpm
run: sudo gem install fpm
- - name: Build project
- run: cargo build --release
-
- name: Build debian package
run: >
- fpm -t deb -p airgorah_${{ matrix.arch }}.deb --architecture native
+ fpm -t deb -p airgorah_${{ matrix.arch }}.deb --architecture ${{ matrix.arch }}
--depends policykit-1
--depends "libgtk-4-1 (>= 4.6.0)"
--depends dbus-x11
@@ -104,6 +103,15 @@ jobs:
--depends mdk4
--depends crunch
+ - name: Test debian package
+ run: >
+ docker run --rm
+ --platform linux/${{ matrix.platform }}
+ -v ${{ github.workspace }}:/workspace
+ -w /workspace
+ debian:bookworm-slim
+ sh -c "apt update && apt install -y ./airgorah_${{ matrix.arch }}.deb"
+
- name: Save debian artifact
uses: actions/upload-artifact@v3
with:
@@ -113,13 +121,22 @@ jobs:
- name: Build redhat package
run: >
- fpm -t rpm -p airgorah_${{ matrix.arch }}.rpm --architecture native
+ fpm -t rpm -p airgorah_${{ matrix.arch }}.rpm --architecture ${{ matrix.arch }}
--depends polkit
--depends "gtk4-devel >= 4.6.0"
--depends dbus-x11
--depends wireshark-cli
--depends iproute
+ - name: Test redhat package
+ run: >
+ docker run --rm
+ --platform linux/${{ matrix.platform }}
+ -v ${{ github.workspace }}:/workspace
+ -w /workspace
+ fedora:38
+ dnf install -y ./airgorah_${{ matrix.arch }}.rpm
+
- name: Save redhat artifact
uses: actions/upload-artifact@v3
with:
@@ -129,7 +146,7 @@ jobs:
- name: Build archlinux package
run: >
- fpm -t pacman -p airgorah_${{ matrix.arch }}.pkg.tar.zst --architecture native
+ fpm -t pacman -p airgorah_${{ matrix.arch }}.pkg.tar.zst --architecture ${{ matrix.arch }}
--depends polkit
--depends gtk4
--depends dbus
@@ -137,6 +154,15 @@ jobs:
--depends iproute2
--depends mdk4
+ - name: Test archlinux package
+ run: >
+ docker run --rm
+ --platform linux/${{ matrix.platform }}
+ -v ${{ github.workspace }}:/workspace
+ -w /workspace
+ manjarolinux/base:latest
+ pacman -U --noconfirm ./airgorah_${{ matrix.arch }}.pkg.tar.zst
+
- name: Save archlinux artifact
uses: actions/upload-artifact@v3
with:
diff --git a/Cargo.lock b/Cargo.lock
index 895e1af..f2b59ea 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -10,17 +10,18 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
[[package]]
name = "aho-corasick"
-version = "1.0.5"
+version = "1.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c378d78423fdad8089616f827526ee33c19f2fddbd5de1629152c9593ba4783"
+checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0"
dependencies = [
"memchr",
]
[[package]]
name = "airgorah"
-version = "0.5.0"
+version = "0.6.0"
dependencies = [
+ "chrono",
"csv",
"ctrlc",
"env_logger",
@@ -28,20 +29,36 @@ dependencies = [
"gtk4",
"lazy_static",
"log",
+ "nix",
"regex",
"serde",
"serde_json",
"sudo",
- "toml 0.8.1",
+ "toml",
"ureq",
"which",
]
+[[package]]
+name = "android-tzdata"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
+
+[[package]]
+name = "android_system_properties"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
+dependencies = [
+ "libc",
+]
+
[[package]]
name = "anyhow"
-version = "1.0.69"
+version = "1.0.75"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "224afbd727c3d6e4b90103ece64b8d1b67fbb1973b1046c2281eed3f3803f800"
+checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6"
[[package]]
name = "autocfg"
@@ -51,27 +68,27 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
[[package]]
name = "base64"
-version = "0.21.3"
+version = "0.21.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "414dcefbc63d77c526a76b3afcf6fbb9b5e2791c19c3aa2297733208750c6e53"
+checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9"
[[package]]
name = "bitflags"
-version = "2.4.0"
+version = "2.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635"
+checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
[[package]]
name = "bumpalo"
-version = "3.12.0"
+version = "3.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535"
+checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec"
[[package]]
name = "cairo-rs"
-version = "0.18.0"
+version = "0.18.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d859b656775a6b1dd078d3e5924884e6ea88aa649a7fdde03d5b2ec56ffcc10b"
+checksum = "f33613627f0dea6a731b0605101fad59ba4f193a52c96c4687728d822605a8a1"
dependencies = [
"bitflags",
"cairo-sys-rs",
@@ -83,9 +100,9 @@ dependencies = [
[[package]]
name = "cairo-sys-rs"
-version = "0.18.0"
+version = "0.18.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd4d115132e01c0165e3bf5f56aedee8980b0b96ede4eb000b693c05a8adb8ff"
+checksum = "685c9fa8e590b8b3d678873528d83411db17242a73fccaed827770ea0fedda51"
dependencies = [
"glib-sys",
"libc",
@@ -94,17 +111,21 @@ dependencies = [
[[package]]
name = "cc"
-version = "1.0.79"
+version = "1.0.83"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f"
+checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0"
+dependencies = [
+ "libc",
+]
[[package]]
name = "cfg-expr"
-version = "0.11.0"
+version = "0.15.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0357a6402b295ca3a86bc148e84df46c02e41f41fef186bda662557ef6328aa"
+checksum = "03915af431787e6ffdcc74c645077518c6b6e01f80b761e0fbbfa288536311b3"
dependencies = [
"smallvec",
+ "target-lexicon",
]
[[package]]
@@ -113,6 +134,26 @@ version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+[[package]]
+name = "chrono"
+version = "0.4.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38"
+dependencies = [
+ "android-tzdata",
+ "iana-time-zone",
+ "js-sys",
+ "num-traits",
+ "wasm-bindgen",
+ "windows-targets",
+]
+
+[[package]]
+name = "core-foundation-sys"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa"
+
[[package]]
name = "crc32fast"
version = "1.3.2"
@@ -124,9 +165,9 @@ dependencies = [
[[package]]
name = "csv"
-version = "1.2.2"
+version = "1.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "626ae34994d3d8d668f4269922248239db4ae42d538b14c398b74a52208e8086"
+checksum = "ac574ff4d437a7b5ad237ef331c17ccca63c46479e5b5453eb8e10bb99a759fe"
dependencies = [
"csv-core",
"itoa",
@@ -136,9 +177,9 @@ dependencies = [
[[package]]
name = "csv-core"
-version = "0.1.10"
+version = "0.1.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b2466559f260f48ad25fe6317b3c8dac77b5bdb5763ac7d9d6103530663bc90"
+checksum = "5efa2b3d7902f4b634a20cae3c9c4e6209dc4779feb6863329607560143efa70"
dependencies = [
"memchr",
]
@@ -155,9 +196,9 @@ dependencies = [
[[package]]
name = "either"
-version = "1.8.1"
+version = "1.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91"
+checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07"
[[package]]
name = "env_logger"
@@ -180,30 +221,19 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
[[package]]
name = "errno"
-version = "0.3.3"
+version = "0.3.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "136526188508e25c6fef639d7927dfb3e0e3084488bf202267829cf7fc23dbdd"
+checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860"
dependencies = [
- "errno-dragonfly",
"libc",
"windows-sys",
]
-[[package]]
-name = "errno-dragonfly"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf"
-dependencies = [
- "cc",
- "libc",
-]
-
[[package]]
name = "field-offset"
-version = "0.3.4"
+version = "0.3.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e1c54951450cbd39f3dbcf1005ac413b49487dabf18a720ad2383eccfeffb92"
+checksum = "38e2275cc4e4fc009b0669731a1e5ab7ebf11f469eaede2bab9309a5b4d6057f"
dependencies = [
"memoffset",
"rustc_version",
@@ -211,9 +241,9 @@ dependencies = [
[[package]]
name = "flate2"
-version = "1.0.25"
+version = "1.0.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841"
+checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e"
dependencies = [
"crc32fast",
"miniz_oxide",
@@ -221,33 +251,33 @@ dependencies = [
[[package]]
name = "form_urlencoded"
-version = "1.1.0"
+version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8"
+checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652"
dependencies = [
"percent-encoding",
]
[[package]]
name = "futures-channel"
-version = "0.3.26"
+version = "0.3.29"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e5317663a9089767a1ec00a487df42e0ca174b61b4483213ac24448e4664df5"
+checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb"
dependencies = [
"futures-core",
]
[[package]]
name = "futures-core"
-version = "0.3.26"
+version = "0.3.29"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec90ff4d0fe1f57d600049061dc6bb68ed03c7d2fbd697274c41805dcb3f8608"
+checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c"
[[package]]
name = "futures-executor"
-version = "0.3.26"
+version = "0.3.29"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8de0a35a6ab97ec8869e32a2473f4b1324459e14c29275d14b10cb1fd19b50e"
+checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc"
dependencies = [
"futures-core",
"futures-task",
@@ -256,32 +286,32 @@ dependencies = [
[[package]]
name = "futures-io"
-version = "0.3.26"
+version = "0.3.29"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfb8371b6fb2aeb2d280374607aeabfc99d95c72edfe51692e42d3d7f0d08531"
+checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa"
[[package]]
name = "futures-macro"
-version = "0.3.26"
+version = "0.3.29"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95a73af87da33b5acf53acfebdc339fe592ecf5357ac7c0a7734ab9d8c876a70"
+checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb"
dependencies = [
"proc-macro2",
"quote",
- "syn 1.0.108",
+ "syn 2.0.38",
]
[[package]]
name = "futures-task"
-version = "0.3.26"
+version = "0.3.29"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcf79a1bf610b10f42aea489289c5a2c478a786509693b80cd39c44ccd936366"
+checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2"
[[package]]
name = "futures-util"
-version = "0.3.26"
+version = "0.3.29"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c1d6de3acfef38d2be4b1f543f553131788603495be83da675e180c8d6b7bd1"
+checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104"
dependencies = [
"futures-core",
"futures-macro",
@@ -293,9 +323,9 @@ dependencies = [
[[package]]
name = "gdk-pixbuf"
-version = "0.18.0"
+version = "0.18.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbc9c2ed73a81d556b65d08879ba4ee58808a6b1927ce915262185d6d547c6f3"
+checksum = "446f32b74d22c33b7b258d4af4ffde53c2bf96ca2e29abdf1a785fe59bd6c82c"
dependencies = [
"gdk-pixbuf-sys",
"gio",
@@ -319,9 +349,9 @@ dependencies = [
[[package]]
name = "gdk4"
-version = "0.7.2"
+version = "0.7.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6982d9815ed6ac95b0467b189e81f29dea26d08a732926ec113e65744ed3f96c"
+checksum = "7edb019ad581f8ecf8ea8e4baa6df7c483a95b5a59be3140be6a9c3b0c632af6"
dependencies = [
"cairo-rs",
"gdk-pixbuf",
@@ -349,11 +379,22 @@ dependencies = [
"system-deps",
]
+[[package]]
+name = "getrandom"
+version = "0.2.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "wasi",
+]
+
[[package]]
name = "gio"
-version = "0.18.1"
+version = "0.18.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7884cba6b1c5db1607d970cadf44b14a43913d42bc68766eea6a5e2fe0891524"
+checksum = "47d809baf02bdf1b5ef4ad3bf60dd9d4977149db4612b7bbb58e56aef168193b"
dependencies = [
"futures-channel",
"futures-core",
@@ -383,9 +424,9 @@ dependencies = [
[[package]]
name = "glib"
-version = "0.18.2"
+version = "0.18.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c316afb01ce8067c5eaab1fc4f2cd47dc21ce7b6296358605e2ffab23ccbd19"
+checksum = "58cf801b6f7829fa76db37449ab67c9c98a2b1bf21076d9113225621e61a0fa6"
dependencies = [
"bitflags",
"futures-channel",
@@ -406,16 +447,16 @@ dependencies = [
[[package]]
name = "glib-macros"
-version = "0.18.0"
+version = "0.18.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "179643c50bf28d20d2f6eacd2531a88f2f5d9747dd0b86b8af1e8bb5dd0de3c0"
+checksum = "72793962ceece3863c2965d7f10c8786323b17c7adea75a515809fa20ab799a5"
dependencies = [
"heck",
- "proc-macro-crate",
+ "proc-macro-crate 2.0.0",
"proc-macro-error",
"proc-macro2",
"quote",
- "syn 2.0.29",
+ "syn 2.0.38",
]
[[package]]
@@ -464,9 +505,9 @@ dependencies = [
[[package]]
name = "gsk4"
-version = "0.7.2"
+version = "0.7.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc25855255120f294d874acd6eaf4fbed7ce1cdc550e2d8415ea57fafbe816d5"
+checksum = "0d958e351d2f210309b32d081c832d7de0aca0b077aa10d88336c6379bd01f7e"
dependencies = [
"cairo-rs",
"gdk4",
@@ -479,9 +520,9 @@ dependencies = [
[[package]]
name = "gsk4-sys"
-version = "0.7.2"
+version = "0.7.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1ecf3a63bf1223d68f80f72cc896c4d8c80482fbce1c9a12c66d3de7290ee46"
+checksum = "12bd9e3effea989f020e8f1ff3fa3b8c63ba93d43b899c11a118868853a56d55"
dependencies = [
"cairo-sys-rs",
"gdk4-sys",
@@ -521,18 +562,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d57ec49cf9b657f69a05bca8027cff0a8dfd0c49e812be026fc7311f2163832f"
dependencies = [
"anyhow",
- "proc-macro-crate",
+ "proc-macro-crate 1.3.1",
"proc-macro-error",
"proc-macro2",
"quote",
- "syn 1.0.108",
+ "syn 1.0.109",
]
[[package]]
name = "gtk4-sys"
-version = "0.7.2"
+version = "0.7.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b0bdde87c50317b4f355bcbb4a9c2c414ece1b7c824fb4ad4ba8f3bdb2c6603"
+checksum = "54d8c4aa23638ce9faa2caf7e2a27d4a1295af2155c8e8d28c4d4eeca7a65eb8"
dependencies = [
"cairo-sys-rs",
"gdk-pixbuf-sys",
@@ -549,15 +590,9 @@ dependencies = [
[[package]]
name = "hashbrown"
-version = "0.12.3"
+version = "0.14.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
-
-[[package]]
-name = "hashbrown"
-version = "0.14.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a"
+checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
[[package]]
name = "heck"
@@ -567,9 +602,9 @@ checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
[[package]]
name = "hermit-abi"
-version = "0.3.2"
+version = "0.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b"
+checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7"
[[package]]
name = "home"
@@ -587,33 +622,46 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
[[package]]
-name = "idna"
-version = "0.3.0"
+name = "iana-time-zone"
+version = "0.1.58"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6"
+checksum = "8326b86b6cff230b97d0d312a6c40a60726df3332e721f72a1b035f451663b20"
dependencies = [
- "unicode-bidi",
- "unicode-normalization",
+ "android_system_properties",
+ "core-foundation-sys",
+ "iana-time-zone-haiku",
+ "js-sys",
+ "wasm-bindgen",
+ "windows-core",
]
[[package]]
-name = "indexmap"
-version = "1.9.2"
+name = "iana-time-zone-haiku"
+version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399"
+checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
dependencies = [
- "autocfg",
- "hashbrown 0.12.3",
+ "cc",
+]
+
+[[package]]
+name = "idna"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c"
+dependencies = [
+ "unicode-bidi",
+ "unicode-normalization",
]
[[package]]
name = "indexmap"
-version = "2.0.0"
+version = "2.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d"
+checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f"
dependencies = [
"equivalent",
- "hashbrown 0.14.0",
+ "hashbrown",
]
[[package]]
@@ -629,15 +677,15 @@ dependencies = [
[[package]]
name = "itoa"
-version = "1.0.5"
+version = "1.0.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440"
+checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38"
[[package]]
name = "js-sys"
-version = "0.3.61"
+version = "0.3.65"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730"
+checksum = "54c0c35952f67de54bb584e9fd912b3023117cbafc0a77d8f3dee1fb5f572fe8"
dependencies = [
"wasm-bindgen",
]
@@ -650,15 +698,15 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
[[package]]
name = "libc"
-version = "0.2.147"
+version = "0.2.149"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3"
+checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b"
[[package]]
name = "linux-raw-sys"
-version = "0.4.5"
+version = "0.4.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503"
+checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f"
[[package]]
name = "log"
@@ -668,24 +716,24 @@ checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
[[package]]
name = "memchr"
-version = "2.6.3"
+version = "2.6.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c"
+checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167"
[[package]]
name = "memoffset"
-version = "0.6.5"
+version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce"
+checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c"
dependencies = [
"autocfg",
]
[[package]]
name = "miniz_oxide"
-version = "0.6.2"
+version = "0.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa"
+checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7"
dependencies = [
"adler",
]
@@ -702,25 +750,25 @@ dependencies = [
]
[[package]]
-name = "nom8"
-version = "0.2.0"
+name = "num-traits"
+version = "0.2.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae01545c9c7fc4486ab7debaf2aad7003ac19431791868fb2e8066df97fad2f8"
+checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
dependencies = [
- "memchr",
+ "autocfg",
]
[[package]]
name = "once_cell"
-version = "1.17.1"
+version = "1.18.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3"
+checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
[[package]]
name = "pango"
-version = "0.18.0"
+version = "0.18.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06a9e54b831d033206160096b825f2070cf5fda7e35167b1c01e9e774f9202d1"
+checksum = "7ca27ec1eb0457ab26f3036ea52229edbdb74dee1edd29063f5b9b010e7ebee4"
dependencies = [
"gio",
"glib",
@@ -743,25 +791,15 @@ dependencies = [
[[package]]
name = "percent-encoding"
-version = "2.2.0"
+version = "2.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e"
-
-[[package]]
-name = "pest"
-version = "2.5.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "028accff104c4e513bad663bbcd2ad7cfd5304144404c31ed0a77ac103d00660"
-dependencies = [
- "thiserror",
- "ucd-trie",
-]
+checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94"
[[package]]
name = "pin-project-lite"
-version = "0.2.9"
+version = "0.2.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116"
+checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58"
[[package]]
name = "pin-utils"
@@ -771,18 +809,27 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
[[package]]
name = "pkg-config"
-version = "0.3.26"
+version = "0.3.27"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160"
+checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964"
[[package]]
name = "proc-macro-crate"
-version = "1.3.0"
+version = "1.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "66618389e4ec1c7afe67d51a9bf34ff9236480f8d51e7489b7d5ab0303c13f34"
+checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919"
dependencies = [
"once_cell",
- "toml_edit 0.18.1",
+ "toml_edit 0.19.15",
+]
+
+[[package]]
+name = "proc-macro-crate"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7e8366a6159044a37876a2b9817124296703c586a5c92e2c53751fa06d8d43e8"
+dependencies = [
+ "toml_edit 0.20.7",
]
[[package]]
@@ -794,7 +841,7 @@ dependencies = [
"proc-macro-error-attr",
"proc-macro2",
"quote",
- "syn 1.0.108",
+ "syn 1.0.109",
"version_check",
]
@@ -811,9 +858,9 @@ dependencies = [
[[package]]
name = "proc-macro2"
-version = "1.0.66"
+version = "1.0.69"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9"
+checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
dependencies = [
"unicode-ident",
]
@@ -829,9 +876,9 @@ dependencies = [
[[package]]
name = "regex"
-version = "1.9.5"
+version = "1.10.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "697061221ea1b4a94a624f67d0ae2bfe4e22b8a17b6a192afb11046542cc8c47"
+checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343"
dependencies = [
"aho-corasick",
"memchr",
@@ -841,9 +888,9 @@ dependencies = [
[[package]]
name = "regex-automata"
-version = "0.3.8"
+version = "0.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2f401f4955220693b56f8ec66ee9c78abffd8d1c4f23dc41a23839eb88f0795"
+checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f"
dependencies = [
"aho-corasick",
"memchr",
@@ -852,39 +899,38 @@ dependencies = [
[[package]]
name = "regex-syntax"
-version = "0.7.5"
+version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da"
+checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"
[[package]]
name = "ring"
-version = "0.16.20"
+version = "0.17.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc"
+checksum = "fb0205304757e5d899b9c2e448b867ffd03ae7f988002e47cd24954391394d0b"
dependencies = [
"cc",
+ "getrandom",
"libc",
- "once_cell",
"spin",
"untrusted",
- "web-sys",
- "winapi",
+ "windows-sys",
]
[[package]]
name = "rustc_version"
-version = "0.3.3"
+version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0dfe2087c51c460008730de8b57e6a320782fbfb312e1f4d520e6c6fae155ee"
+checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
dependencies = [
"semver",
]
[[package]]
name = "rustix"
-version = "0.38.12"
+version = "0.38.21"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bdf14a7a466ce88b5eac3da815b53aefc208ce7e74d1c263aabb04d88c4abeb1"
+checksum = "2b426b0506e5d50a7d8dafcf2e81471400deb602392c7dd110815afb4eaf02a3"
dependencies = [
"bitflags",
"errno",
@@ -895,31 +941,21 @@ dependencies = [
[[package]]
name = "rustls"
-version = "0.21.7"
+version = "0.21.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd8d6c9f025a446bc4d18ad9632e69aec8f287aa84499ee335599fabd20c3fd8"
+checksum = "446e14c5cda4f3f30fe71863c34ec70f5ac79d6087097ad0bb433e1be5edf04c"
dependencies = [
"log",
"ring",
- "rustls-webpki 0.101.4",
+ "rustls-webpki",
"sct",
]
[[package]]
name = "rustls-webpki"
-version = "0.100.2"
+version = "0.101.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e98ff011474fa39949b7e5c0428f9b4937eda7da7848bbb947786b7be0b27dab"
-dependencies = [
- "ring",
- "untrusted",
-]
-
-[[package]]
-name = "rustls-webpki"
-version = "0.101.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d93931baf2d282fff8d3a532bbfd7653f734643161b87e3e01e59a04439bf0d"
+checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765"
dependencies = [
"ring",
"untrusted",
@@ -927,15 +963,15 @@ dependencies = [
[[package]]
name = "ryu"
-version = "1.0.12"
+version = "1.0.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde"
+checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741"
[[package]]
name = "sct"
-version = "0.7.0"
+version = "0.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4"
+checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414"
dependencies = [
"ring",
"untrusted",
@@ -943,47 +979,35 @@ dependencies = [
[[package]]
name = "semver"
-version = "0.11.0"
+version = "1.0.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6"
-dependencies = [
- "semver-parser",
-]
-
-[[package]]
-name = "semver-parser"
-version = "0.10.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00b0bef5b7f9e0df16536d3961cfb6e84331c065b4066afb39768d0e319411f7"
-dependencies = [
- "pest",
-]
+checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090"
[[package]]
name = "serde"
-version = "1.0.188"
+version = "1.0.190"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e"
+checksum = "91d3c334ca1ee894a2c6f6ad698fe8c435b76d504b13d436f0685d648d6d96f7"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
-version = "1.0.188"
+version = "1.0.190"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2"
+checksum = "67c5609f394e5c2bd7fc51efda478004ea80ef42fee983d5c67a65e34f32c0e3"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.29",
+ "syn 2.0.38",
]
[[package]]
name = "serde_json"
-version = "1.0.107"
+version = "1.0.108"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65"
+checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b"
dependencies = [
"itoa",
"ryu",
@@ -992,33 +1016,33 @@ dependencies = [
[[package]]
name = "serde_spanned"
-version = "0.6.3"
+version = "0.6.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186"
+checksum = "12022b835073e5b11e90a14f86838ceb1c8fb0325b72416845c487ac0fa95e80"
dependencies = [
"serde",
]
[[package]]
name = "slab"
-version = "0.4.8"
+version = "0.4.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d"
+checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67"
dependencies = [
"autocfg",
]
[[package]]
name = "smallvec"
-version = "1.10.0"
+version = "1.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0"
+checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
[[package]]
name = "spin"
-version = "0.5.2"
+version = "0.9.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
+checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
[[package]]
name = "sudo"
@@ -1032,9 +1056,9 @@ dependencies = [
[[package]]
name = "syn"
-version = "1.0.108"
+version = "1.0.109"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d56e159d99e6c2b93995d171050271edb50ecc5288fbc7cc17de8fdce4e58c14"
+checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
dependencies = [
"proc-macro2",
"quote",
@@ -1043,9 +1067,9 @@ dependencies = [
[[package]]
name = "syn"
-version = "2.0.29"
+version = "2.0.38"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c324c494eba9d92503e6f1ef2e6df781e78f6a7705a0202d9801b198807d518a"
+checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b"
dependencies = [
"proc-macro2",
"quote",
@@ -1054,44 +1078,50 @@ dependencies = [
[[package]]
name = "system-deps"
-version = "6.0.3"
+version = "6.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2955b1fe31e1fa2fbd1976b71cc69a606d7d4da16f6de3333d0c92d51419aeff"
+checksum = "2a2d580ff6a20c55dfb86be5f9c238f67835d0e81cbdea8bf5680e0897320331"
dependencies = [
"cfg-expr",
"heck",
"pkg-config",
- "toml 0.5.11",
+ "toml",
"version-compare",
]
+[[package]]
+name = "target-lexicon"
+version = "0.12.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "14c39fd04924ca3a864207c66fc2cd7d22d7c016007f9ce846cbb9326331930a"
+
[[package]]
name = "termcolor"
-version = "1.2.0"
+version = "1.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6"
+checksum = "6093bad37da69aab9d123a8091e4be0aa4a03e4d601ec641c327398315f62b64"
dependencies = [
"winapi-util",
]
[[package]]
name = "thiserror"
-version = "1.0.38"
+version = "1.0.50"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0"
+checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2"
dependencies = [
"thiserror-impl",
]
[[package]]
name = "thiserror-impl"
-version = "1.0.38"
+version = "1.0.50"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f"
+checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8"
dependencies = [
"proc-macro2",
"quote",
- "syn 1.0.108",
+ "syn 2.0.38",
]
[[package]]
@@ -1111,81 +1141,60 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
[[package]]
name = "toml"
-version = "0.5.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "toml"
-version = "0.8.1"
+version = "0.8.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bc1433177506450fe920e46a4f9812d0c211f5dd556da10e731a0a3dfa151f0"
+checksum = "8ff9e3abce27ee2c9a37f9ad37238c1bdd4e789c84ba37df76aa4d528f5072cc"
dependencies = [
"serde",
"serde_spanned",
- "toml_datetime 0.6.3",
- "toml_edit 0.20.1",
+ "toml_datetime",
+ "toml_edit 0.20.7",
]
[[package]]
name = "toml_datetime"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4553f467ac8e3d374bc9a177a26801e5d0f9b211aa1673fb137a403afd1c9cf5"
-
-[[package]]
-name = "toml_datetime"
-version = "0.6.3"
+version = "0.6.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b"
+checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1"
dependencies = [
"serde",
]
[[package]]
name = "toml_edit"
-version = "0.18.1"
+version = "0.19.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56c59d8dd7d0dcbc6428bf7aa2f0e823e26e43b3c9aca15bbc9475d23e5fa12b"
+checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
dependencies = [
- "indexmap 1.9.2",
- "nom8",
- "toml_datetime 0.5.1",
+ "indexmap",
+ "toml_datetime",
+ "winnow",
]
[[package]]
name = "toml_edit"
-version = "0.20.1"
+version = "0.20.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca676d9ba1a322c1b64eb8045a5ec5c0cfb0c9d08e15e9ff622589ad5221c8fe"
+checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81"
dependencies = [
- "indexmap 2.0.0",
+ "indexmap",
"serde",
"serde_spanned",
- "toml_datetime 0.6.3",
+ "toml_datetime",
"winnow",
]
-[[package]]
-name = "ucd-trie"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e79c4d996edb816c91e4308506774452e55e95c3c9de07b6729e17e15a5ef81"
-
[[package]]
name = "unicode-bidi"
-version = "0.3.10"
+version = "0.3.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d54675592c1dbefd78cbd98db9bacd89886e1ca50692a0692baefffdeb92dd58"
+checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460"
[[package]]
name = "unicode-ident"
-version = "1.0.6"
+version = "1.0.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc"
+checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
[[package]]
name = "unicode-normalization"
@@ -1198,22 +1207,22 @@ dependencies = [
[[package]]
name = "untrusted"
-version = "0.7.1"
+version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"
+checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
[[package]]
name = "ureq"
-version = "2.7.1"
+version = "2.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b11c96ac7ee530603dcdf68ed1557050f374ce55a5a07193ebf8cbc9f8927e9"
+checksum = "f5ccd538d4a604753ebc2f17cd9946e89b77bf87f6a8e2309667c6f2e87855e3"
dependencies = [
"base64",
"flate2",
"log",
"once_cell",
"rustls",
- "rustls-webpki 0.100.2",
+ "rustls-webpki",
"serde",
"serde_json",
"url",
@@ -1222,9 +1231,9 @@ dependencies = [
[[package]]
name = "url"
-version = "2.3.1"
+version = "2.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643"
+checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5"
dependencies = [
"form_urlencoded",
"idna",
@@ -1243,11 +1252,17 @@ version = "0.9.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
+[[package]]
+name = "wasi"
+version = "0.11.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+
[[package]]
name = "wasm-bindgen"
-version = "0.2.84"
+version = "0.2.88"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b"
+checksum = "7daec296f25a1bae309c0cd5c29c4b260e510e6d813c286b19eaadf409d40fce"
dependencies = [
"cfg-if",
"wasm-bindgen-macro",
@@ -1255,24 +1270,24 @@ dependencies = [
[[package]]
name = "wasm-bindgen-backend"
-version = "0.2.84"
+version = "0.2.88"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9"
+checksum = "e397f4664c0e4e428e8313a469aaa58310d302159845980fd23b0f22a847f217"
dependencies = [
"bumpalo",
"log",
"once_cell",
"proc-macro2",
"quote",
- "syn 1.0.108",
+ "syn 2.0.38",
"wasm-bindgen-shared",
]
[[package]]
name = "wasm-bindgen-macro"
-version = "0.2.84"
+version = "0.2.88"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5"
+checksum = "5961017b3b08ad5f3fe39f1e79877f8ee7c23c5e5fd5eb80de95abc41f1f16b2"
dependencies = [
"quote",
"wasm-bindgen-macro-support",
@@ -1280,52 +1295,40 @@ dependencies = [
[[package]]
name = "wasm-bindgen-macro-support"
-version = "0.2.84"
+version = "0.2.88"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6"
+checksum = "c5353b8dab669f5e10f5bd76df26a9360c748f054f862ff5f3f8aae0c7fb3907"
dependencies = [
"proc-macro2",
"quote",
- "syn 1.0.108",
+ "syn 2.0.38",
"wasm-bindgen-backend",
"wasm-bindgen-shared",
]
[[package]]
name = "wasm-bindgen-shared"
-version = "0.2.84"
+version = "0.2.88"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d"
-
-[[package]]
-name = "web-sys"
-version = "0.3.61"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97"
-dependencies = [
- "js-sys",
- "wasm-bindgen",
-]
+checksum = "0d046c5d029ba91a1ed14da14dca44b68bf2f124cfbaf741c54151fdb3e0750b"
[[package]]
name = "webpki-roots"
-version = "0.23.1"
+version = "0.25.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b03058f88386e5ff5310d9111d53f48b17d732b401aeb83a8d5190f2ac459338"
-dependencies = [
- "rustls-webpki 0.100.2",
-]
+checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc"
[[package]]
name = "which"
-version = "4.4.2"
+version = "5.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7"
+checksum = "9bf3ea8596f3a0dd5980b46430f2058dfe2c36a27ccfbb1845d6fbfcd9ba6e14"
dependencies = [
"either",
"home",
"once_cell",
"rustix",
+ "windows-sys",
]
[[package]]
@@ -1346,9 +1349,9 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
[[package]]
name = "winapi-util"
-version = "0.1.5"
+version = "0.1.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
+checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596"
dependencies = [
"winapi",
]
@@ -1359,6 +1362,15 @@ version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+[[package]]
+name = "windows-core"
+version = "0.51.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64"
+dependencies = [
+ "windows-targets",
+]
+
[[package]]
name = "windows-sys"
version = "0.48.0"
@@ -1427,9 +1439,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
[[package]]
name = "winnow"
-version = "0.5.15"
+version = "0.5.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c2e3184b9c4e92ad5167ca73039d0c42476302ab603e2fec4487511f38ccefc"
+checksum = "176b6138793677221d420fd2f0aeeced263f197688b36484660da767bca2fa32"
dependencies = [
"memchr",
]
diff --git a/Cargo.toml b/Cargo.toml
index d9969df..3a06981 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "airgorah"
-version = "0.5.0"
+version = "0.6.0"
edition = "2021"
license = "MIT"
description = "A WiFi auditing software that can perform deauth attacks and passwords cracking"
@@ -10,20 +10,22 @@ repository = "https://github.com/martin-olivier/airgorah"
documentation = "https://github.com/martin-olivier/airgorah/wiki"
keywords = ["networking", "pentest", "aircrack-ng", "gui", "linux"]
readme = "README.md"
-exclude = ["/.github", "/package"]
+exclude = ["/.github", "/package", "/docker"]
[dependencies]
-gtk4 = { version = "0.7.3", features = ["v4_6"] }
-glib = "0.18.2"
-serde = { version = "1.0.188", features = ["derive"] }
-serde_json = "1.0.107"
-toml = "0.8.1"
-csv = "1.2.2"
-sudo = "0.6.0"
-ctrlc = "3.4.1"
-regex = "1.9.5"
-lazy_static = "1.4.0"
-ureq = { version = "2.7.1", features = ["json"] }
-which = "4.4.2"
-log = "0.4.20"
-env_logger = "0.10.0"
+gtk4 = { version = "0.7", features = ["v4_6"] }
+glib = "0.18"
+serde = { version = "1", features = ["derive"] }
+serde_json = "1"
+toml = "0.8"
+csv = "1.3"
+sudo = "0.6"
+ctrlc = "3.4"
+regex = "1.10"
+chrono = "0.4"
+lazy_static = "1"
+ureq = { version = "2.8", features = ["json"] }
+which = "5"
+log = "0.4"
+env_logger = "0.10"
+nix = "0.27"
diff --git a/README.md b/README.md
index 1701e55..c721e57 100644
--- a/README.md
+++ b/README.md
@@ -1,44 +1,25 @@
<h1 align="center">
<img src="icons/app_icon.png" width=100 height=100/><br>
- Airgorah
- </a>
-</h1>
+Airgorah</h1>
<p align="center">
<span>A WiFi auditing software that can perform deauth attacks and passwords cracking</span>
</p>
<p align="center">
- <a href="#installation">Installation</a>
+ <a href="https://github.com/martin-olivier/airgorah/wiki/Installation">Installation</a>
&nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;&nbsp;
- <a href="#usage">Usage</a>
+ <a href="https://github.com/martin-olivier/airgorah/wiki/Usage">Usage</a>
&nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;&nbsp;
<a href="#contributing">Contributing</a>
</p>
-<p align="center">
- <a href="https://github.com/martin-olivier/airgorah/releases/tag/v0.5.0">
- <img src="https://img.shields.io/badge/Release-v0.5.0-blue.svg" alt="version"/>
- </a>
- <a href="https://github.com/martin-olivier/airgorah/blob/main/LICENSE">
- <img src="https://img.shields.io/badge/License-MIT-darkgreen.svg" alt="license"/>
- </a>
- <a href="https://github.com/martin-olivier/airgorah/actions/workflows/CI.yml">
- <img src="https://github.com/martin-olivier/airgorah/actions/workflows/CI.yml/badge.svg" alt="ci"/>
- </a>
-</p>
-
-<p align="center">
- <a href="https://crates.io/crates/airgorah">
- <img src="https://img.shields.io/crates/v/airgorah.svg" alt="crates"/>
- </a>
- <a href="https://aur.archlinux.org/packages/airgorah">
- <img src="https://img.shields.io/aur/version/airgorah" alt="aur"/>
- </a>
-</p>
-
![illustration](.github/assets/illustration.png)
+[![crates](https://img.shields.io/crates/v/airgorah.svg)](https://crates.io/crates/airgorah)
+[![aur](https://img.shields.io/aur/version/airgorah)](https://aur.archlinux.org/packages/airgorah)
+[![ci](https://github.com/martin-olivier/airgorah/actions/workflows/CI.yml/badge.svg)](https://github.com/martin-olivier/airgorah/actions/workflows/CI.yml)
+
`Airgorah` is a WiFi auditing software that can discover the clients connected to an access point, perform deauthentication attacks against specific clients or all the clients connected to it, capture WPA handshakes, and crack the password of the access point.
It is written in Rust and uses [GTK4](https://github.com/gtk-rs/gtk4-rs) for the graphical part. The software is mainly based on [aircrack-ng](https://github.com/aircrack-ng/aircrack-ng) tools suite.
diff --git a/docker/amd64_builder/Dockerfile b/docker/amd64_builder/Dockerfile
new file mode 100644
index 0000000..43cbf86
--- /dev/null
+++ b/docker/amd64_builder/Dockerfile
@@ -0,0 +1,5 @@
+FROM amd64/rust:slim-bookworm
+
+WORKDIR /workspace
+
+RUN apt update && apt install -y build-essential libgtk-4-dev libglib2.0-dev
diff --git a/docker/arm64_builder/Dockerfile b/docker/arm64_builder/Dockerfile
new file mode 100644
index 0000000..4ee440d
--- /dev/null
+++ b/docker/arm64_builder/Dockerfile
@@ -0,0 +1,5 @@
+FROM arm64v8/rust:slim-bookworm
+
+WORKDIR /workspace
+
+RUN apt update && apt install -y build-essential libgtk-4-dev libglib2.0-dev
diff --git a/src/backend/capture.rs b/src/backend/capture.rs
index dd85a9d..d6cd7f1 100755
--- a/src/backend/capture.rs
+++ b/src/backend/capture.rs
@@ -7,23 +7,16 @@ use std::process::Command;
/// Update the handshake capture status of all APs
pub fn update_handshakes() -> Result<(), Error> {
- let capture_output = Command::new("aircrack-ng")
- .args([
- &(LIVE_SCAN_PATH.to_string() + "-01.cap"),
- &(OLD_SCAN_PATH.to_string() + "-01.cap"),
- ])
- .output()?;
-
- let stdout = String::from_utf8_lossy(&capture_output.stdout).to_string();
- let lines = stdout.lines();
+ let handshakes = get_handshakes([
+ &(LIVE_SCAN_PATH.to_string() + "-01.cap"),
+ &(OLD_SCAN_PATH.to_string() + "-01.cap"),
+ ])?;
+
let mut aps = get_aps();
- for data in lines {
- for (bssid, ap) in aps.iter_mut() {
- if data.contains(bssid) && data.contains("WPA (") && !data.contains("WPA (0 handshake)")
- {
- ap.handshake = true;
- }
+ for (bssid, _) in handshakes {
+ if let Some(ap) = aps.get_mut(&bssid) {
+ ap.handshake = true;
}
}
@@ -33,16 +26,25 @@ pub fn update_handshakes() -> Result<(), Error> {
}
/// Get the access points infos of the handshakes contained in the capture file
-pub fn get_handshakes(path: &str) -> Result<Vec<(String, String)>, Error> {
- let capture_output = Command::new("aircrack-ng").args([path]).output()?;
+pub fn get_handshakes<I, S>(args: I) -> Result<Vec<(String, String)>, Error>
+where
+ I: IntoIterator<Item = S>,
+ S: AsRef<std::ffi::OsStr>,
+{
+ let capture_output = Command::new("aircrack-ng").args(args).output()?;
+
+ let output = String::from_utf8_lossy(&capture_output.stdout).to_string();
- let stdout = String::from_utf8_lossy(&capture_output.stdout).to_string();
- let re =
- Regex::new(r"(\d+)\s+([\w:]+)\s+([\w\s]*)\s+WPA \((\d+)\s+handshake(?:.*?)\)").unwrap();
+ let re = Regex::new(r"\s+(\d+)\s+([\w:]+)\s+(.*)\s+WPA \((\d+)\s+handshake.*\)")?;
let mut handshakes = vec![];
- for caps in re.captures_iter(&stdout) {
+ for line in output.lines() {
+ let caps = match re.captures(line) {
+ Some(caps) => caps,
+ None => continue,
+ };
+
let bssid = caps[2].to_string();
let essid = caps[3].trim().to_string();
let handshake_count = caps[4].to_string();
diff --git a/src/backend/scan.rs b/src/backend/scan.rs
index 357afde..7935ce6 100644
--- a/src/backend/scan.rs
+++ b/src/backend/scan.rs
@@ -10,6 +10,9 @@ use crate::types::*;
use serde::Deserialize;
+use nix::sys::signal::{kill, Signal};
+use nix::unistd::Pid;
+
/// Represents the AP section of the csv file generated by airodump
#[derive(Debug, Deserialize)]
struct RawAP {
@@ -176,9 +179,11 @@ pub fn set_scan_process(
/// Stop the scan process
pub fn stop_scan_process() -> Result<(), Error> {
if let Some(child) = SCAN_PROC.lock().unwrap().as_mut() {
- Command::new("kill").arg(child.id().to_string()).status()?;
+ let child_pid = Pid::from_raw(child.id() as i32);
+
+ kill(child_pid, Signal::SIGTERM)?;
- child.wait().ok();
+ child.wait()?;
}
SCAN_PROC.lock().unwrap().take();
diff --git a/src/error.rs b/src/error.rs
index a7510b2..39e1e73 100644
--- a/src/error.rs
+++ b/src/error.rs
@@ -38,3 +38,19 @@ impl From<std::string::FromUtf8Error> for Error {
}
}
}
+
+impl From<regex::Error> for Error {
+ fn from(error: regex::Error) -> Error {
+ Error {
+ message: error.to_string(),
+ }
+ }
+}
+
+impl From<nix::errno::Errno> for Error {
+ fn from(error: nix::errno::Errno) -> Error {
+ Error {
+ message: error.to_string(),
+ }
+ }
+}
diff --git a/src/frontend/connections/app.rs b/src/frontend/connections/app.rs
index 4e12d18..ab49641 100755
--- a/src/frontend/connections/app.rs
+++ b/src/frontend/connections/app.rs
@@ -431,6 +431,7 @@ fn connect_capture_button(app_data: Rc<AppData>) {
None => return,
};
+ let essid = list_store_get!(app_data.app_gui.aps_model, &iter, 0, String);
let bssid = list_store_get!(app_data.app_gui.aps_model, &iter, 1, String);
let ap = match backend::get_aps().get(&bssid) {
@@ -459,7 +460,7 @@ fn connect_capture_button(app_data: Rc<AppData>) {
&[("Save", ResponseType::Accept)],
);
- file_chooser_dialog.set_current_name("capture.cap");
+ file_chooser_dialog.set_current_name(&format!("{}.cap", essid));
file_chooser_dialog.run_async(clone!(@strong app_data => move |this, response| {
if response == ResponseType::Accept {
this.close();
diff --git a/src/frontend/connections/deauth.rs b/src/frontend/connections/deauth.rs
index c041752..18f560a 100755
--- a/src/frontend/connections/deauth.rs
+++ b/src/frontend/connections/deauth.rs
@@ -31,6 +31,20 @@ fn get_selected_clients(storage: &ListStore) -> Vec<String> {
selected_clients
}
+fn connect_controller(app_data: Rc<AppData>) {
+ let controller = gtk4::EventControllerKey::new();
+
+ controller.connect_key_pressed(clone!(@strong app_data => move |_, key, _, _| {
+ if key == gdk::Key::Escape {
+ app_data.deauth_gui.window.hide();
+ }
+
+ glib::Propagation::Proceed
+ }));
+
+ app_data.deauth_gui.window.add_controller(controller);
+}
+
fn connect_all_cli_button(app_data: Rc<AppData>) {
app_data
.deauth_gui
@@ -117,6 +131,8 @@ fn connect_attack_but(app_data: Rc<AppData>) {
}
pub fn connect(app_data: Rc<AppData>) {
+ connect_controller(app_data.clone());
+
connect_all_cli_button(app_data.clone());
connect_sel_cli_button(app_data.clone());
connect_toggle(app_data.clone());
diff --git a/src/frontend/connections/decrypt.rs b/src/frontend/connections/decrypt.rs
index 0e18056..09eeea0 100755
--- a/src/frontend/connections/decrypt.rs
+++ b/src/frontend/connections/decrypt.rs
@@ -8,6 +8,20 @@ use gtk4::prelude::*;
use gtk4::*;
use std::rc::Rc;
+fn connect_controller(app_data: Rc<AppData>) {
+ let controller = gtk4::EventControllerKey::new();
+
+ controller.connect_key_pressed(clone!(@strong app_data => move |_, key, _, _| {
+ if key == gdk::Key::Escape {
+ app_data.decrypt_gui.window.hide();
+ }
+
+ glib::Propagation::Proceed
+ }));
+
+ app_data.decrypt_gui.window.add_controller(controller);
+}
+
fn update_decrypt_button_status(app_data: Rc<AppData>) {
if app_data.decrypt_gui.handshake_entry.text_length() == 0 {
return app_data.decrypt_gui.decrypt_but.set_sensitive(false);
@@ -55,7 +69,8 @@ fn connect_handshake_button(app_data: Rc<AppData>) {
let gio_path = gio_file.path().unwrap();
let file_path = gio_path.to_str().unwrap();
- let handshakes = backend::get_handshakes(file_path).unwrap_or_default();
+
+ let handshakes = backend::get_handshakes([file_path]).unwrap_or_default();
if handshakes.is_empty() {
return ErrorDialog::spawn(
@@ -186,6 +201,8 @@ fn connect_decrypt_button(app_data: Rc<AppData>) {
}
pub fn connect(app_data: Rc<AppData>) {
+ connect_controller(app_data.clone());
+
connect_handshake_button(app_data.clone());
connect_stack_notify(app_data.clone());
connect_wordlist_button(app_data.clone());
diff --git a/src/frontend/connections/interface.rs b/src/frontend/connections/interface.rs
index f1efbc7..585e163 100644
--- a/src/frontend/connections/interface.rs
+++ b/src/frontend/connections/interface.rs
@@ -7,6 +7,20 @@ use glib::clone;
use gtk4::prelude::*;
use std::rc::Rc;
+fn connect_controller(app_data: Rc<AppData>) {
+ let controller = gtk4::EventControllerKey::new();
+
+ controller.connect_key_pressed(clone!(@strong app_data => move |_, key, _, _| {
+ if key == gdk::Key::Escape {
+ app_data.interface_gui.window.hide();
+ }
+
+ glib::Propagation::Proceed
+ }));
+
+ app_data.interface_gui.window.add_controller(controller);
+}
+
fn connect_interface_refresh(app_data: Rc<AppData>) {
app_data
.interface_gui
@@ -82,6 +96,8 @@ fn connect_interface_select(app_data: Rc<AppData>) {
}
pub fn connect(app_data: Rc<AppData>) {
+ connect_controller(app_data.clone());
+
connect_interface_refresh(app_data.clone());
connect_interface_select(app_data);
}
diff --git a/src/frontend/connections/scan.rs b/src/frontend/connections/scan.rs
index 632037b..75b2546 100644
--- a/src/frontend/connections/scan.rs
+++ b/src/frontend/connections/scan.rs
@@ -1,6 +1,7 @@
use crate::backend;
use crate::frontend::interfaces::*;
use crate::frontend::*;
+use crate::list_store_get;
use crate::types::*;
use glib::clone;
@@ -10,32 +11,18 @@ use std::fs::File;
use std::io::Write;
use std::rc::Rc;
+use chrono::Local;
+
fn run_scan(app_data: &AppData) {
let iface = match backend::get_iface() {
Some(iface) => iface,
None => return app_data.interface_gui.window.show(),
};
- if !app_data.app_gui.ghz_2_4_but.is_active() && !app_data.app_gui.ghz_5_but.is_active() {
- return ErrorDialog::spawn(
- &app_data.app_gui.window,
- "Error",
- "You need to select at least one frequency band",
- );
- }
-
let mut ghz_2_4 = false;
let mut ghz_5 = false;
if app_data.app_gui.ghz_5_but.is_active() {
- if !backend::is_5ghz_supported(&iface).unwrap() {
- ErrorDialog::spawn(
- &app_data.app_gui.window,
- "Error",
- "Your network card doesn't support 5GHz",
- );
- return app_data.app_gui.ghz_5_but.set_active(false);
- }
ghz_5 = true;
}
if app_data.app_gui.ghz_2_4_but.is_active() {
@@ -119,7 +106,10 @@ fn connect_export_button(app_data: Rc<AppData>) {
&[("Save", ResponseType::Accept)],
);
- file_chooser_dialog.set_current_name("capture.cap");
+ let local = Local::now();
+ let date = local.format("%Y-%m-%d-%Hh%M");
+
+ file_chooser_dialog.set_current_name(&format!("capture_{}.cap", date));
file_chooser_dialog.run_async(clone!(@strong app_data => move |this, response| {
if response == ResponseType::Accept {
this.close();
@@ -171,7 +161,10 @@ fn connect_report_button(app_data: Rc<AppData>) {
&[("Save", ResponseType::Accept)],
));
- file_chooser_dialog.set_current_name("report.json");
+ let local = Local::now();
+ let date = local.format("%Y-%m-%d-%Hh%M");
+
+ file_chooser_dialog.set_current_name(&format!("report_{}.json", date));
file_chooser_dialog.run_async(move |this, response| {
if response == ResponseType::Accept {
let gio_file = match this.file() {
@@ -191,9 +184,6 @@ fn connect_ghz_2_4_button(app_data: Rc<AppData>) {
.app_gui
.ghz_2_4_but
.connect_toggled(clone!(@strong app_data => move |this| {
- let filter = app_data.app_gui.channel_filter_entry.text();
- app_data.app_gui.channel_filter_entry.set_text(&filter);
-
if backend::is_scan_process() {
if !this.is_active() && !app_data.app_gui.ghz_5_but.is_active() {
ErrorDialog::spawn(
@@ -205,6 +195,9 @@ fn connect_ghz_2_4_button(app_data: Rc<AppData>) {
}
run_scan(&app_data);
}
+
+ let filter = app_data.app_gui.channel_filter_entry.text();
+ app_data.app_gui.channel_filter_entry.set_text(&filter);
}));
}
@@ -213,9 +206,6 @@ pub fn connect_ghz_5_button(app_data: Rc<AppData>) {
.app_gui
.ghz_5_but
.connect_toggled(clone!(@strong app_data => move |this| {
- let filter = app_data.app_gui.channel_filter_entry.text();
- app_data.app_gui.channel_filter_entry.set_text(&filter);
-
let iface = match backend::get_iface() {
Some(iface) => iface,
None => return,
@@ -241,6 +231,9 @@ pub fn connect_ghz_5_button(app_data: Rc<AppData>) {
}
run_scan(&app_data);
}
+
+ let filter = app_data.app_gui.channel_filter_entry.text();
+ app_data.app_gui.channel_filter_entry.set_text(&filter);
}));
}
@@ -282,6 +275,29 @@ fn connect_cursor_changed(app_data: Rc<AppData>) {
true => {
app_data.app_gui.focus_but.set_sensitive(true);
app_data.app_gui.deauth_but.set_sensitive(true);
+
+ let (_, ap_iter) = this.selection().selected().unwrap();
+ let bssid = list_store_get!(app_data.app_gui.aps_model, &ap_iter, 1, String);
+ let aps = backend::get_aps();
+
+ let mut clients = match aps.get(&bssid) {
+ Some(ap) => ap.clients.keys().clone(),
+ None => return,
+ };
+ let mut cli_iter = app_data.app_gui.cli_model.iter_first();
+
+ while let Some(it) = cli_iter {
+ let mac_val = list_store_get!(app_data.app_gui.cli_model, &it, 0, String);
+
+ if !clients.any(|x| &mac_val == x) {
+ break;
+ }
+
+ cli_iter = match app_data.app_gui.cli_model.iter_next(&it) {
+ true => Some(it),
+ false => return,
+ }
+ }
}
false => {
app_data.app_gui.focus_but.set_sensitive(false);
diff --git a/src/frontend/connections/settings.rs b/src/frontend/connections/settings.rs
index 0b039f0..44e93d2 100644
--- a/src/frontend/connections/settings.rs
+++ b/src/frontend/connections/settings.rs
@@ -8,6 +8,20 @@ use gtk4::*;
use regex::Regex;
use std::rc::Rc;
+fn connect_controller(app_data: Rc<AppData>) {
+ let controller = gtk4::EventControllerKey::new();
+
+ controller.connect_key_pressed(clone!(@strong app_data => move |_, key, _, _| {
+ if key == gdk::Key::Escape {
+ app_data.settings_gui.window.hide();
+ }
+
+ glib::Propagation::Proceed
+ }));
+
+ app_data.settings_gui.window.add_controller(controller);
+}
+
fn connect_random_mac_button(app_data: Rc<AppData>) {
app_data
.settings_gui
@@ -83,6 +97,8 @@ fn connect_save_but(app_data: Rc<AppData>) {
}
pub fn connect(app_data: Rc<AppData>) {
+ connect_controller(app_data.clone());
+
connect_random_mac_button(app_data.clone());
connect_default_mac_button(app_data.clone());
connect_specific_mac_button(app_data.clone());
diff --git a/src/frontend/interfaces/app.rs b/src/frontend/interfaces/app.rs
index bd6fb76..d2cc821 100755
--- a/src/frontend/interfaces/app.rs
+++ b/src/frontend/interfaces/app.rs
@@ -7,28 +7,28 @@ use gtk4::*;
fn build_about_button() -> Button {
Button::builder()
- .icon_name("dialog-information")
+ .icon_name("help-about-symbolic")
.tooltip_text("About")
.build()
}
fn build_update_button() -> Button {
Button::builder()
- .icon_name("emblem-downloads")
+ .icon_name("folder-download-symbolic")
.tooltip_text("Update available")
.build()
}
fn build_decrypt_button() -> Button {
Button::builder()
- .icon_name("utilities-terminal")
+ .icon_name("utilities-terminal-symbolic")
.tooltip_text("Handshake decryption")
.build()
}
fn build_settings_button() -> Button {
Button::builder()
- .icon_name("preferences-system")
+ .icon_name("emblem-system-symbolic")
.tooltip_text("Settings")
.build()
}
@@ -58,7 +58,7 @@ fn build_export_button() -> Button {
fn build_report_button() -> Button {
Button::builder()
- .icon_name("text-x-generic-symbolic")
+ .icon_name("edit-paste-symbolic")
.tooltip_text("Save captured data as .json file")
.sensitive(false)
.build()
@@ -115,7 +115,7 @@ fn build_window(app: &Application) -> ApplicationWindow {
let window = ApplicationWindow::builder()
.application(app)
.title("")
- .default_width(1240)
+ .default_width(1280)
.default_height(620)
.build();
diff --git a/src/frontend/interfaces/decrypt.rs b/src/frontend/interfaces/decrypt.rs
index b1cac74..c5abca4 100644
--- a/src/frontend/interfaces/decrypt.rs
+++ b/src/frontend/interfaces/decrypt.rs
@@ -193,7 +193,7 @@ impl DecryptGui {
if let Some((path, bssid)) = capture_and_bssid {
self.handshake_entry.set_text(&path);
- let handshakes = backend::get_handshakes(&path).unwrap_or_default();
+ let handshakes = backend::get_handshakes([&path]).unwrap_or_default();
if handshakes.is_empty() {
return ErrorDialog::spawn(
diff --git a/src/globals.rs b/src/globals.rs
index b8f5871..d6788f2 100644
--- a/src/globals.rs
+++ b/src/globals.rs
@@ -7,7 +7,7 @@ use std::sync::Mutex;
use std::thread::JoinHandle;
pub static APP_ID: &str = "com.molivier.airgorah";
-pub static VERSION: &str = "v0.5.0";
+pub static VERSION: &str = "v0.6.0";
pub static LIVE_SCAN_PATH: &str = "/tmp/airgorah_live_scan";
pub static OLD_SCAN_PATH: &str = "/tmp/airgorah_old_scan";
diff --git a/src/main.rs b/src/main.rs
index 2f0b59a..308f0af 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,5 +1,5 @@
use gtk4::prelude::*;
-use gtk4::Application;
+use gtk4::{Application, Settings};
mod backend;
mod error;
@@ -10,6 +10,12 @@ mod types;
fn main() {
env_logger::init();
+ gtk4::init().expect("Could not initialize gtk4");
+
+ Settings::default()
+ .unwrap()
+ .set_gtk_icon_theme_name(Some("Adwaita"));
+
let application = Application::builder()
.application_id(globals::APP_ID)
.build();