Skip to content

Commit cb5ce6d

Browse files
GyulyVGCGyulyVGC
authored
Merge branch 'translations' into patch-1
2 parents e50043a + 3d8919f commit cb5ce6d

101 files changed

Lines changed: 3901 additions & 3921 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.all-contributorsrc‎

Lines changed: 74 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -601,7 +601,8 @@
601601
"avatar_url": "https://avatars.githubusercontent.com/u/171437458?v=4",
602602
"profile": "https://github.com/shu-kitamura",
603603
"contributions": [
604-
"code"
604+
"code",
605+
"translation"
605606
]
606607
},
607608
{
@@ -703,6 +704,78 @@
703704
"contributions": [
704705
"translation"
705706
]
707+
},
708+
{
709+
"login": "celtic-coder",
710+
"name": "Liam OBrien",
711+
"avatar_url": "https://avatars.githubusercontent.com/u/11787866?v=4",
712+
"profile": "https://github.com/celtic-coder",
713+
"contributions": [
714+
"ideas"
715+
]
716+
},
717+
{
718+
"login": "SignPath",
719+
"name": "SignPath GmbH",
720+
"avatar_url": "https://avatars.githubusercontent.com/u/34448643?v=4",
721+
"profile": "https://signpath.io",
722+
"contributions": [
723+
"platform"
724+
]
725+
},
726+
{
727+
"login": "islameehassan",
728+
"name": "islameehassan",
729+
"avatar_url": "https://avatars.githubusercontent.com/u/98806155?v=4",
730+
"profile": "https://github.com/islameehassan",
731+
"contributions": [
732+
"code"
733+
]
734+
},
735+
{
736+
"login": "lionrayonnant",
737+
"name": "Lion Rayonnant",
738+
"avatar_url": "https://avatars.githubusercontent.com/u/106342136?v=4",
739+
"profile": "https://github.com/lionrayonnant",
740+
"contributions": [
741+
"translation"
742+
]
743+
},
744+
{
745+
"login": "18601673727",
746+
"name": "18601673727",
747+
"avatar_url": "https://avatars.githubusercontent.com/u/3302620?v=4",
748+
"profile": "https://github.com/18601673727",
749+
"contributions": [
750+
"translation"
751+
]
752+
},
753+
{
754+
"login": "AlleM43",
755+
"name": "AlleM43",
756+
"avatar_url": "https://avatars.githubusercontent.com/u/16104173?v=4",
757+
"profile": "https://github.com/AlleM43",
758+
"contributions": [
759+
"platform"
760+
]
761+
},
762+
{
763+
"login": "aris1009",
764+
"name": "Aris Konstantoulas",
765+
"avatar_url": "https://avatars.githubusercontent.com/u/25184469?v=4",
766+
"profile": "https://github.com/aris1009",
767+
"contributions": [
768+
"translation"
769+
]
770+
},
771+
{
772+
"login": "mmseng",
773+
"name": "Matt Seng",
774+
"avatar_url": "https://avatars.githubusercontent.com/u/8218085?v=4",
775+
"profile": "https://github.com/mmseng",
776+
"contributions": [
777+
"financial"
778+
]
706779
}
707780
],
708781
"contributorsPerLine": 7,

‎.github/workflows/docker.yml‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
name: Docker
22

33
on:
4-
# push:
5-
# tags:
6-
# - 'v[0-9]+.[0-9]+.[0-9]+'
74
workflow_dispatch:
85

96
jobs:
@@ -12,7 +9,7 @@ jobs:
129
runs-on: ubuntu-latest
1310
steps:
1411
- name: Checkout
15-
uses: actions/checkout@v4
12+
uses: actions/checkout@v5
1613

1714
- name: Extract version from Cargo.toml
1815
id: cargo-version
@@ -21,6 +18,13 @@ jobs:
2118
echo "VERSION=$VERSION" >> $GITHUB_ENV
2219
echo "version=$VERSION" >> $GITHUB_OUTPUT
2320
21+
- name: Check there is no existing image with the same version
22+
run: |
23+
if docker manifest inspect ghcr.io/gyulyvgc/sniffnet:${{ env.VERSION }}; then
24+
echo "Image with version ${{ env.VERSION }} already exists"
25+
exit 1
26+
fi
27+
2428
- name: Set up QEMU
2529
uses: docker/setup-qemu-action@v3
2630

@@ -43,4 +47,3 @@ jobs:
4347
tags: |
4448
ghcr.io/gyulyvgc/sniffnet:latest
4549
ghcr.io/gyulyvgc/sniffnet:${{ env.VERSION }}
46-
# ghcr.io/gyulyvgc/sniffnet:${{ github.ref_name }}

‎.github/workflows/package.yml‎

Lines changed: 87 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838

3939
steps:
4040
- name: Checkout repository
41-
uses: actions/checkout@v4
41+
uses: actions/checkout@v5
4242

4343
- name: Install Linux dependencies
4444
if: matrix.os == 'ubuntu'
@@ -126,7 +126,7 @@ jobs:
126126

127127
steps:
128128
- name: Checkout repository
129-
uses: actions/checkout@v4
129+
uses: actions/checkout@v5
130130

131131
- name: Install dependencies
132132
run: apt-get update -y && apt-get install -y curl build-essential
@@ -139,7 +139,7 @@ jobs:
139139
- name: Install packaging tools
140140
run: cargo install cargo-deb
141141

142-
- uses: actions/download-artifact@v4
142+
- uses: actions/download-artifact@v5
143143
with:
144144
name: build-ubuntu-${{ matrix.target }}
145145
path: target/
@@ -158,6 +158,63 @@ jobs:
158158
path: artifacts/
159159
if-no-files-found: error
160160

161+
appimage:
162+
runs-on: ubuntu-latest
163+
container:
164+
image: debian:latest
165+
options: --privileged
166+
needs: deb
167+
strategy:
168+
fail-fast: true
169+
matrix:
170+
include:
171+
- arch: amd64
172+
appimgarch: x86_64
173+
- arch: arm64
174+
appimgarch: aarch64
175+
- arch: i386
176+
appimgarch: i686
177+
- arch: armhf
178+
appimgarch: armhf
179+
180+
steps:
181+
- name: Checkout repository
182+
uses: actions/checkout@v5
183+
184+
- name: Install dependencies
185+
run: apt-get update -y && apt-get install -y git build-essential graphicsmagick-imagemagick-compat wget file desktop-file-utils libfuse2
186+
187+
- name: Download Debian package
188+
uses: actions/download-artifact@v5
189+
with:
190+
name: deb-${{ matrix.arch }}
191+
path: /target/
192+
193+
- name: Download pkg2appimage
194+
shell: bash
195+
run: git clone https://github.com/AppImageCommunity/pkg2appimage.git
196+
197+
- name: Replace placeholders
198+
shell: bash
199+
run: |
200+
sed -i -e 's/REPLACE_TAG/Sniffnet_LinuxDEB_${{ matrix.arch }}.deb/g' resources/packaging/linux/AppImage/sniffnet.yml
201+
sed -i -e 's/binary-${arch}/binary-${{ matrix.arch }}/g' pkg2appimage/functions.sh
202+
203+
- name: Repackage for AppImage
204+
shell: bash
205+
run: |
206+
cd pkg2appimage
207+
ARCH=${{ matrix.appimgarch }} FUNCTIONS_SH=$(pwd)/functions.sh ./pkg2appimage ../resources/packaging/linux/AppImage/sniffnet.yml
208+
mkdir /out
209+
mv out/*.AppImage /out/Sniffnet_LinuxAppImage_${{ matrix.arch }}.AppImage
210+
211+
- name: Upload package artifacts
212+
uses: actions/upload-artifact@v4
213+
with:
214+
name: appimage-${{ matrix.arch }}
215+
path: /out/
216+
if-no-files-found: error
217+
161218
rpm:
162219
runs-on: ubuntu-latest
163220
container:
@@ -174,7 +231,7 @@ jobs:
174231

175232
steps:
176233
- name: Checkout repository
177-
uses: actions/checkout@v4
234+
uses: actions/checkout@v5
178235

179236
- name: Install dependencies
180237
run: dnf update -y && dnf install -y @development-tools patchelf
@@ -187,7 +244,7 @@ jobs:
187244
- name: Install packaging tools
188245
run: cargo install cargo-generate-rpm
189246

190-
- uses: actions/download-artifact@v4
247+
- uses: actions/download-artifact@v5
191248
with:
192249
name: build-ubuntu-${{ matrix.target }}
193250
path: target/
@@ -221,7 +278,7 @@ jobs:
221278

222279
steps:
223280
- name: Checkout repository
224-
uses: actions/checkout@v4
281+
uses: actions/checkout@v5
225282

226283
- name: Install Rust
227284
uses: dtolnay/rust-toolchain@stable
@@ -231,7 +288,7 @@ jobs:
231288
cargo install toml-cli
232289
brew install create-dmg
233290
234-
- uses: actions/download-artifact@v4
291+
- uses: actions/download-artifact@v5
235292
with:
236293
name: build-macos-${{ matrix.target }}
237294
path: target/
@@ -285,7 +342,7 @@ jobs:
285342

286343
steps:
287344
- name: Checkout repository
288-
uses: actions/checkout@v4
345+
uses: actions/checkout@v5
289346

290347
- name: Install dependencies
291348
shell: powershell
@@ -306,7 +363,7 @@ jobs:
306363
- name: Install packaging tools
307364
run: cargo install cargo-wix
308365

309-
- uses: actions/download-artifact@v4
366+
- uses: actions/download-artifact@v5
310367
with:
311368
name: build-windows-${{ matrix.target }}
312369
path: target/
@@ -318,9 +375,29 @@ jobs:
318375
cargo wix --no-build --nocapture --target ${{ matrix.target }}
319376
Move-Item -Path target\wix\sniffnet*.msi -Destination .\artifacts\Sniffnet_Windows_${{ matrix.arch }}.msi
320377
321-
- name: Upload package artifacts
378+
- name: Upload unsigned package artifacts
379+
id: upload-unsigned-artifact
380+
uses: actions/upload-artifact@v4
381+
with:
382+
name: msi-${{ matrix.arch }}
383+
path: artifacts/
384+
if-no-files-found: error
385+
386+
- name: Sign package artifacts
387+
uses: signpath/github-action-submit-signing-request@v1.3
388+
with:
389+
api-token: '${{ secrets.SIGNPATH_API_TOKEN }}'
390+
organization-id: '3b533e02-73c3-4908-a018-d09a34498a6a'
391+
project-slug: 'sniffnet'
392+
signing-policy-slug: 'release-signing'
393+
github-artifact-id: '${{ steps.upload-unsigned-artifact.outputs.artifact-id }}'
394+
wait-for-completion: true
395+
output-artifact-directory: './artifacts'
396+
397+
- name: Upload signed package artifacts (overwrite unsigned)
322398
uses: actions/upload-artifact@v4
323399
with:
324400
name: msi-${{ matrix.arch }}
325401
path: artifacts/
326402
if-no-files-found: error
403+
overwrite: true

‎.github/workflows/rust.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
- os: windows
3333

3434
steps:
35-
- uses: actions/checkout@v4
35+
- uses: actions/checkout@v5
3636
- uses: dtolnay/rust-toolchain@stable
3737
with:
3838
components: rustfmt, clippy

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,3 +57,6 @@ $RECYCLE.BIN/
5757
### Custom... ###
5858
lcov.info
5959
*.pcap
60+
node_modules
61+
package.json
62+
yarn.lock

‎CHANGELOG.md‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,21 @@
33
All Sniffnet releases with the relative changes are documented in this file.
44

55
## [UNRELEASED]
6+
- Enhanced traffic filtering capabilities: Berkeley Packet Filter ([#937](https://github.com/GyulyVGC/sniffnet/pull/937) — fixes [#810](https://github.com/GyulyVGC/sniffnet/issues/810))
7+
- Added support for `Linux SLL` link type, enabling to monitor the `any` interface on Linux ([#945](https://github.com/GyulyVGC/sniffnet/pull/945))
8+
- Added _bits_ data representation ([#936](https://github.com/GyulyVGC/sniffnet/pull/936) — fixes [#506](https://github.com/GyulyVGC/sniffnet/issues/506))
9+
- An AppImage of Sniffnet is now available ([#859](https://github.com/GyulyVGC/sniffnet/pull/859) — fixes [#900](https://github.com/GyulyVGC/sniffnet/issues/900))
610
- Added Dutch translation 🇳🇱 ([#854](https://github.com/GyulyVGC/sniffnet/pull/854))
11+
- Improved configurations persistence across different runs of the app ([#938](https://github.com/GyulyVGC/sniffnet/pull/938) — fixes [#507](https://github.com/GyulyVGC/sniffnet/issues/507))
12+
- The Windows Installer is now signed with a code signing certificate provided by the [SignPath Foundation](https://signpath.org/) ([#897](https://github.com/GyulyVGC/sniffnet/pull/897) — fixes [#894](https://github.com/GyulyVGC/sniffnet/issues/894))
13+
- Updated some of the existing translations to v1.4:
14+
- German ([#833](https://github.com/GyulyVGC/sniffnet/pull/833))
15+
- Uzbek ([#834](https://github.com/GyulyVGC/sniffnet/pull/834))
16+
- Simplified Chinese ([#838](https://github.com/GyulyVGC/sniffnet/pull/838))
17+
- Japanese ([#849](https://github.com/GyulyVGC/sniffnet/pull/849))
18+
- French ([#864](https://github.com/GyulyVGC/sniffnet/pull/864))
19+
- Greek ([#879](https://github.com/GyulyVGC/sniffnet/pull/879))
20+
- Fix support for IPinfo's databases (the most recent version renamed the `country` field to `country_code`)
721

822
## [1.4.0] - 2025-06-27
923
- Import PCAP files ([#795](https://github.com/GyulyVGC/sniffnet/pull/795) — fixes [#283](https://github.com/GyulyVGC/sniffnet/issues/283))

0 commit comments

Comments
 (0)