+
## Anti-forensic and secure messenger
@@ -49,7 +49,7 @@ Amnezichat offers a highly secure and privacy-focused messaging experience by en
- EdDSA and Dilithium5 for authentication, ECDH and Kyber1024 for key exchange, encryption using ChaCha20-Poly1305
-## Basic server setup:
+## Server setup:
sudo apt update
sudo apt install curl build-essential git
@@ -59,16 +59,16 @@ Amnezichat offers a highly secure and privacy-focused messaging experience by en
cargo build --release
cargo run --release
-## Onionsite setup with Docker:
+## Server setup with Docker:
sudo apt update
sudo apt install docker.io git
git clone https://github.com/umutcamliyurt/Amnezichat.git
- cd Amnezichat/
- sudo docker build -t amnezichat:latest .
- sudo docker run -p 8080:8080 amnezichat:latest
+ cd Amnezichat/server/
+ sudo docker build -t amnezichatserver:latest .
+ sudo docker run -p 8080:8080 amnezichatserver:latest
-## Client usage:
+## Client setup:
**For Web UI connect to http://localhost:8000**
@@ -81,6 +81,15 @@ Amnezichat offers a highly secure and privacy-focused messaging experience by en
cargo build --release
cargo run --release
+## Client setup with Docker:
+
+ sudo apt update
+ sudo apt install docker.io git
+ git clone https://github.com/umutcamliyurt/Amnezichat.git
+ cd Amnezichat/client/
+ sudo docker build -t amnezichat:latest .
+ sudo docker run -p 8000:8000 amnezichat:latest
+
## Requirements:
- [Rust](https://www.rust-lang.org), [Tor](https://gitlab.torproject.org/tpo/core/tor), [I2P](https://i2pd.website/)
diff --git a/README_TR.md b/README_TR.md
index 36b473b..69978ba 100644
--- a/README_TR.md
+++ b/README_TR.md
@@ -5,7 +5,7 @@
# Amnezichat
-
+
## İz bırakmayan güvenli mesajlaşma
@@ -59,16 +59,16 @@ Amnezichat, hiçbir kayıt tutulmamasını ve tüm mesaj verilerinin yalnızca s
cargo build --release
cargo run --release
-## Docker ile Onion sitesi kurulumu:
+## Docker ile sunucu kurulumu:
sudo apt update
sudo apt install docker.io git
git clone https://github.com/umutcamliyurt/Amnezichat.git
- cd Amnezichat/
- sudo docker build -t amnezichat:latest .
- sudo docker run -p 8080:8080 amnezichat:latest
+ cd Amnezichat/server/
+ sudo docker build -t amnezichatserver:latest .
+ sudo docker run -p 8080:8080 amnezichatserver:latest
-## İstemci kullanımı:
+## İstemci kurulumu:
**Web UI için http://localhost:8000 adresine bağlanın**
@@ -81,6 +81,15 @@ Amnezichat, hiçbir kayıt tutulmamasını ve tüm mesaj verilerinin yalnızca s
cargo build --release
cargo run --release
+## Docker ile istemci kurulumu:
+
+ sudo apt update
+ sudo apt install docker.io git
+ git clone https://github.com/umutcamliyurt/Amnezichat.git
+ cd Amnezichat/client/
+ sudo docker build -t amnezichat:latest .
+ sudo docker run -p 8000:8000 amnezichat:latest
+
## Gereksinimler:
- [Rust](https://www.rust-lang.org), [Tor](https://gitlab.torproject.org/tpo/core/tor), [I2P](https://i2pd.website/)
diff --git a/client/Cargo.toml b/client/Cargo.toml
index 71b3747..c16d9ff 100644
--- a/client/Cargo.toml
+++ b/client/Cargo.toml
@@ -21,4 +21,7 @@ rpassword = "7.3.1"
sha3 = "0.10.8"
x25519-dalek = "2.0.1"
ed25519-dalek = "2.1.1"
-rocket = { version = "0.5", features = ["json"] }
\ No newline at end of file
+rocket = { version = "0.5", features = ["json"] }
+eframe = "0.26"
+egui = "0.26"
+rfd = "0.12"
\ No newline at end of file
diff --git a/client/Dockerfile b/client/Dockerfile
new file mode 100644
index 0000000..5d4f472
--- /dev/null
+++ b/client/Dockerfile
@@ -0,0 +1,26 @@
+FROM debian:12
+
+ENV DEBIAN_FRONTEND=noninteractive
+ENV RUSTUP_HOME=/usr/local/rustup \
+ CARGO_HOME=/usr/local/cargo \
+ PATH=/usr/local/cargo/bin:$PATH
+
+RUN apt-get update && \
+ apt-get install -y \
+ curl \
+ build-essential \
+ git \
+ tor && \
+ apt-get clean && \
+ rm -rf /var/lib/apt/lists/*
+
+RUN curl https://sh.rustup.rs -sSf | sh -s -- -y
+
+RUN git clone https://github.com/umutcamliyurt/Amnezichat.git /opt/Amnezichat
+
+WORKDIR /opt/Amnezichat/client
+RUN cargo build --release
+
+EXPOSE 8000
+
+CMD tor & cargo run --release
diff --git a/client/cloudflare-ip-blacklist.txt b/client/cloudflare-ip-blacklist.txt
deleted file mode 100644
index ca50c34..0000000
--- a/client/cloudflare-ip-blacklist.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-173.245.48.0/20
-103.21.244.0/22
-103.22.200.0/22
-103.31.4.0/22
-141.101.64.0/18
-108.162.192.0/18
-190.93.240.0/20
-188.114.96.0/20
-197.234.240.0/22
-198.41.128.0/17
-162.158.0.0/15
-104.16.0.0/13
-104.24.0.0/14
-172.64.0.0/13
-131.0.72.0/22
-2400:cb00::/32
-2606:4700::/32
-2803:f800::/32
-2405:b500::/32
-2405:8100::/32
-2a06:98c0::/29
-2c0f:f248::/32
diff --git a/client/src/main.rs b/client/src/main.rs
index 7bfa3c2..b0a6e83 100644
--- a/client/src/main.rs
+++ b/client/src/main.rs
@@ -34,29 +34,33 @@ use encryption::decrypt_data;
use oqs::*;
use oqs::sig::{Sig, PublicKey, SecretKey, Algorithm as SigAlgorithm};
use rand::Rng;
-use reqwest::blocking::get;
-use std::fs;
use std::fs::File;
use std::fs::OpenOptions;
use std::io::BufRead;
use std::io::BufReader;
use std::path::Path;
use std::process::Command;
-use std::str::FromStr;
+use std::sync::Arc;
+use std::sync::Mutex;
+use std::thread;
+use std::time::Duration;
use hex;
use std::io::{self, Write};
-use rpassword::read_password;
use std::result::Result;
use std::{
collections::HashSet,
error::Error,
};
-use ipnetwork::IpNetwork;
use serde::{Deserialize, Serialize};
use chacha20poly1305::aead::OsRng;
use rand::RngCore;
use sha3::{Sha3_512, Digest};
use ed25519_dalek::VerifyingKey as Ed25519PublicKey;
+use eframe::egui;
+use rfd::MessageDialog;
+use rfd::MessageButtons;
+use rfd::MessageLevel;
+use rfd::MessageDialogResult;
fn get_raw_bytes_public_key(pk: &PublicKey) -> &[u8] {
pk.as_ref()
@@ -95,7 +99,6 @@ fn request_user_confirmation(
}
let path = "contact_fingerprints.enc";
-
let trusted_fingerprints = load_trusted_fingerprints(path, password)?;
if trusted_fingerprints.contains(fingerprint) {
@@ -103,34 +106,39 @@ fn request_user_confirmation(
return Ok(true);
}
- println!("The fingerprint of the received public key is: {}", fingerprint);
- print!("Do you confirm this fingerprint? (yes/no): ");
- io::stdout().flush()?;
+ let message = format!(
+ "🔒 Fingerprint Verification\n\n\
+ Your fingerprint:\n{}\n\n\
+ Received fingerprint:\n{}\n\n\
+ Do you want to trust the received fingerprint?",
+ own_fingerprint, fingerprint
+ );
- let mut input = String::new();
- io::stdin().read_line(&mut input)?;
- let response = input.trim().to_lowercase();
+ let confirm = MessageDialog::new()
+ .set_title("Trust New Fingerprint")
+ .set_level(MessageLevel::Info)
+ .set_description(&message)
+ .set_buttons(MessageButtons::YesNo)
+ .show();
- match response.as_str() {
- "yes" => {
- print!("Would you like to remember this fingerprint for future sessions? (yes/no): ");
- io::stdout().flush()?;
+ if confirm == MessageDialogResult::Yes {
+ let remember = MessageDialog::new()
+ .set_title("Remember Fingerprint?")
+ .set_level(MessageLevel::Info)
+ .set_description(
+ "💾 Would you like to remember this fingerprint for future sessions?\n\
+ This prevents asking again for the same contact."
+ )
+ .set_buttons(MessageButtons::YesNo)
+ .show();
- input.clear();
- io::stdin().read_line(&mut input)?;
- let remember_response = input.trim().to_lowercase();
-
- if remember_response == "yes" {
- save_fingerprint(path, fingerprint, password)?;
- }
-
- Ok(true)
- }
- "no" => Ok(false),
- _ => {
- println!("Invalid input. Please enter 'yes' or 'no'.");
- request_user_confirmation(fingerprint, own_fingerprint, password)
+ if remember == MessageDialogResult::Yes {
+ save_fingerprint(path, fingerprint, password)?;
}
+
+ Ok(true)
+ } else {
+ Ok(false)
}
}
@@ -194,57 +202,6 @@ fn generate_random_room_id() -> String {
room_id
}
-fn load_blacklist(file_path: &str) -> HashSet