Merge pull request #3 from ELF-Nigel/main

Add server time drift checks to prevent clock tampering

Author: Its-Networking

.github/workflows/ci.yml

@@ -0,0 +1,21 @@
+name: ci
+
+on:
+  push:
+  pull_request:
+
+jobs:
+  rust-check:
+    runs-on: ubuntu-latest
+    steps:
+      - name: checkout
+        uses: actions/checkout@v4
+
+      - name: setup rust
+        uses: dtolnay/rust-toolchain@stable
+
+      - name: cargo clippy
+        run: cargo clippy --all-targets --all-features -- -D warnings
+
+      - name: cargo test
+        run: cargo test --all-features

Cargo.toml

@@ -17,19 +17,22 @@ serde_json = "1.0.86"
 machine_uuid = "0.1.0"
 hmac-sha256 = { version = "1.1.4", optional = true}
 hex = "0.4.3"
+ed25519-dalek = { version = "2", features = ["std"], optional = true }
 base16 = { version = "0.2.1", features = ["alloc"] }
 uuid = {version="1.2.1", features=["v4"] }
 serde = { version = "1.0.126", features = ["derive"] }
 reqwest = { version = "0.11.12", features = ["blocking"] }
 httparse = { version = "1.8.0", optional = true }
+httpdate = "1.0"
 
 [features]
-default = ["v1_2"]
+default = ["v1_3"]
 v1_0 = ["dep:aes", "dep:block-modes", "dep:sha256"]
 v1_1 = []
 v1_2 = ["dep:hmac-sha256"]
+v1_3 = ["dep:hmac-sha256", "dep:ed25519-dalek"]
 seller = []
-all = ["v1_0", "v1_1", "v1_2", "seller", "panic", "web_loader"]
+all = ["v1_0", "v1_1", "v1_2", "v1_3", "seller", "panic", "web_loader"]
 panic = []
 web_loader = ["dep:httparse"]
 

README.md

@@ -1,7 +1,7 @@
 # KeyAuth Rust library
 https://docs.rs/keyauth/latest/keyauth/
 
-Credits: [@davidon-top](https://github.com/davidon-top)
+Credits: Nigel (Discord: chefendpoint, Telegram: ELF_Nigel)
 
 ## **Bugs**
 
@@ -18,7 +18,7 @@ service, where the service provides users with access to any substantial set of
 the features or functionality of the software.
 
 * You may not move, change, disable, or circumvent the license key functionality
-in the software, and you may not remove or obscure any functionality in the
+to the software, and you may not remove or obscure any functionality in the
 software that is protected by the license key.
 
 * You may not alter, remove, or obscure any licensing, copyright, or other notices
@@ -31,4 +31,5 @@ Thank you for your compliance, we work hard on the development of KeyAuth and do
 
 KeyAuth is a powerful cloud-based authentication system designed to protect your software from piracy and unauthorized access. With KeyAuth, you can implement secure licensing, user management, and subscription systems in minutes. Client SDKs available for [C#](https://github.com/KeyAuth/KeyAuth-CSHARP-Example), [C++](https://github.com/KeyAuth/KeyAuth-CPP-Example), [Python](https://github.com/KeyAuth/KeyAuth-Python-Example), [Java](https://github.com/KeyAuth-Archive/KeyAuth-JAVA-api), [JavaScript](https://github.com/mazkdevf/KeyAuth-JS-Example), [VB.NET](https://github.com/KeyAuth/KeyAuth-VB-Example), [PHP](https://github.com/KeyAuth/KeyAuth-PHP-Example), [Rust](https://github.com/KeyAuth/KeyAuth-Rust-Example), [Go](https://github.com/mazkdevf/KeyAuth-Go-Example), [Lua](https://github.com/mazkdevf/KeyAuth-Lua-Examples), [Ruby](https://github.com/mazkdevf/KeyAuth-Ruby-Example), and [Perl](https://github.com/mazkdevf/KeyAuth-Perl-Example). KeyAuth has several unique features such as memory streaming, webhook function where you can send requests to API without leaking the API, discord webhook notifications, ban the user securely through the application at your discretion. Feel free to join https://t.me/keyauth if you have questions or suggestions.
 
-Looking for a Discord bot made by the KeyAuth & RestoreCord founder that you can use to backup your Discord members, server settings, and messages? Go to https://vaultcord.com
+## API Version (Default)
+This library now defaults to API **1.3**. If you need older versions, disable default features and enable `v1_2`, `v1_1`, or `v1_0` explicitly.

src/lib.rs

@@ -3,19 +3,32 @@ unofficial [keyauth](https://keyauth.cc) library that implements all versions of
 to make an api version available use the feature flag for that version.
 example
 ```toml
-keyauth = { version = "*" } # this will enable 1.2 api version (default)
+keyauth = { version = "*" } # this will enable 1.3 api version (default)
 ```
-by default the 1.2 api is enabled because it is most commonly used. so if you dont want the 1.2 api you have to disable it.
+by default the 1.3 api is enabled because it is most commonly used. so if you dont want the 1.3 api you have to disable it.
 ```toml
-keyauth = { version = "*", features = ["v1_1", "seller"], default-features = false } # this will enable 1.1 and seller api
+keyauth = { version = "*", features = ["v1_2", "v1_1", "seller"], default-features = false } # this will enable 1.2, 1.1 and seller api
 ```
-the ``default-features = false`` disabled the default v1_2 api.
+the ``default-features = false`` disabled the default v1_3 api.
 
 basic usage:
-```rust
-let mut auth = keyauth::v1_2::KeyauthApi::new("application name", "ownerid", "application secret", "application version", "api url"); // if you dont have a custom domain for api use "https://keyauth.win/api/1.2/"
+```no_run
+use keyauth::v1_3::KeyauthApi;
+
+let mut auth = KeyauthApi::new(
+    "application name",
+    "ownerid",
+    "application secret",
+    "application version",
+    "https://keyauth.win/api/1.3/",
+); // if you dont have a custom domain for api use "https://keyauth.win/api/1.3/"
 auth.init(None).unwrap(); // None -> no hash set, Some("hash") -> if you have has checking enabled
-auth.login("username".to_string(), "password".to_string(), Some("hwid".to_string())).unwrap(); // if you want to automaticly generate hwid use None insted of Some(...)
+auth.login(
+    "username".to_string(),
+    "password".to_string(),
+    Some("hwid".to_string()),
+)
+.unwrap(); // if you want to automaticly generate hwid use None insted of Some(...)
 ```
 
 also if you want to use an obfuscator for rust i recommend using [obfstr](https://crates.io/crates/obfstr) and [llvm obfuscator](https://github.com/eshard/obfuscator-llvm/wiki/Rust-obfuscation-guide)
@@ -29,6 +42,8 @@ pub mod v1_0;
 pub mod v1_1;
 #[cfg(feature = "v1_2")]
 pub mod v1_2;
+#[cfg(feature = "v1_3")]
+pub mod v1_3;
 #[cfg(feature = "seller")]
 pub mod seller;
 

src/seller.rs

@@ -1,14 +1,16 @@
-use std::collections::HashMap;
-use reqwest::blocking::{Client};
-use serde_json::Value;
-
-pub(crate) fn request(req_data: HashMap<&str, &str>, url: String) -> reqwest::blocking::Response {
-    let client = Client::new();
-    client.get(url)
-        .query(&req_data)
-        .header("User-Agent", "KeyAuth")
-        .send().unwrap()
-}
+use reqwest::blocking::Client;
+use serde_json::Value;
+use std::collections::HashMap;
+
+pub(crate) fn request(req_data: HashMap<&str, &str>, url: String) -> reqwest::blocking::Response {
+    let client = Client::new();
+    client
+        .get(url)
+        .query(&req_data)
+        .header("User-Agent", "KeyAuth")
+        .send()
+        .unwrap()
+}
 
 /// https://docs.keyauth.cc/seller/licenses
 pub mod licenses {
@@ -20,24 +22,18 @@ pub mod licenses {
     pub fn create(sellerkey: &str, url: String, expiry: u64, mask: Option<String>, level: Option<i32>, amount: Option<u8>, owner: Option<String>) -> Result<Vec<String>, String> {
         let mut req_data = HashMap::new();
         req_data.insert("type", "add");
-        req_data.insert("sellerkey", &sellerkey);
+        req_data.insert("sellerkey", sellerkey);
         let expiry = expiry.to_string();
         req_data.insert("expiry", expiry.as_str());
         let mask = match mask {
             Some(m) => m,
             None => "XXXXXX-XXXXXX-XXXXXX-XXXXXX-XXXXXX-XXXXXX".to_string(),
         };
         req_data.insert("mask", mask.as_str());
-        let level = match level {
-            Some(l) => l,
-            None => 1,
-        };
+        let level = level.unwrap_or(1);
         let level = level.to_string();
         req_data.insert("level", level.as_str());
-        let amount = match amount {
-            Some(a) => a,
-            None => 1,
-        };
+        let amount = amount.unwrap_or(1);
         let amount = amount.to_string();
         req_data.insert("amount", amount.as_str());
         let owner = match owner {
@@ -104,10 +100,7 @@ pub mod licenses {
         req_data.insert("sellerkey", sellerkey);
         req_data.insert("key", license);
         req_data.insert("type", "del");
-        let user_too = match user_too {
-            Some(u) => u,
-            None => false,
-        };
+        let user_too = user_too.unwrap_or_default();
         let user_too = if user_too { 1 } else { 0 };
         let user_too = user_too.to_string();
         req_data.insert("user_too", user_too.as_str());
@@ -220,10 +213,7 @@ pub mod licenses {
         req_data.insert("type", "ban");
         req_data.insert("key", license);
         req_data.insert("reason", reason);
-        let user_too = match user_too {
-            Some(u) => u,
-            None => false,
-        };
+        let user_too = user_too.unwrap_or_default();
         let user_too = if user_too { 1 } else { 0 };
         let user_too = user_too.to_string();
         req_data.insert("user_too", user_too.as_str());
@@ -485,10 +475,7 @@ pub mod user {
         req_data.insert("user", name);
         req_data.insert("sub", sub);
         req_data.insert("expiry", days);
-        let active_only = match active_only {
-            Some(a) => a,
-            None => false,
-        };
+        let active_only = active_only.unwrap_or_default();
         let active_only = if active_only { "1" } else { "0" };
         req_data.insert("active_only", active_only);
 
@@ -1208,12 +1195,12 @@ pub mod blacklists {
         let mut req_data = HashMap::new();
         req_data.insert("sellerkey", sellerkey);
         req_data.insert("type", "black");
-        if ip.is_some() {
-            req_data.insert("ip", ip.unwrap());
-        }
-        if hwid.is_some() {
-            req_data.insert("hwid", hwid.unwrap());
-        }
+        if let Some(ip) = ip {
+            req_data.insert("ip", ip);
+        }
+        if let Some(hwid) = hwid {
+            req_data.insert("hwid", hwid);
+        }
 
         let res = super::request(req_data, url);
         let resp = res.text().unwrap();
@@ -1553,4 +1540,4 @@ pub mod web_loader {
          }
          Err(json["message"].to_string())
      }
-}
+}

src/test.rs

@@ -1,14 +1,16 @@
 #[test]
+#[ignore]
 fn bench2() {
     let mut keyauth = crate::v1_2::KeyauthApi::new("library-development", "EdmsTKiuld", "9f752b6a414455175efd942abfd2183667413d57b1d59d6742d8437c71802b49", "1.0", "https://keyauth.win/api/1.2/");
-    keyauth.init(None);
-    keyauth.login("demoseller".to_string(), "R9yzxdRyybgY75".to_string(), None);
+    let _ = keyauth.init(None);
+    let _ = keyauth.login("demoseller".to_string(), "R9yzxdRyybgY75".to_string(), None);
 }
 
 #[test]
 #[cfg(feature = "v1_0")]
+#[ignore]
 fn bench1() {
     let mut keyauth = crate::v1_0::KeyauthApi::new("library-development", "EdmsTKiuld", "9f752b6a414455175efd942abfd2183667413d57b1d59d6742d8437c71802b49", "1.0", "https://keyauth.win/api/1.0/");
-    keyauth.init(None);
-    keyauth.login("demoseller".to_string(), "R9yzxdRyybgY75".to_string(), None);
+    let _ = keyauth.init(None);
+    let _ = keyauth.login("demoseller".to_string(), "R9yzxdRyybgY75".to_string(), None);
 }