Fixed group scope

Added client isolation settings. Fixed mobile UI
2026-07-30 23:29:38 +01:00 · 2026-07-30 23:27:34 +01:00 · 2026-07-30 23:03:18 +01:00 · 2026-07-06 16:57:26 +03:00 · 2026-07-06 16:30:16 +03:00
11 changed files with 771 additions and 46 deletions
@@ -61,7 +61,7 @@ checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923"

 [[package]]
 name = "amnezia-fellow"
-version = "0.1.6"
+version = "1.0.1"
 dependencies = [
 "async-trait",
 "base64 0.22.1",
@@ -1,6 +1,6 @@
 [package]
 name = "amnezia-fellow"
-version = "0.1.7"
+version = "1.0.1"
 edition = "2024"
 description = "Amnezia VPN client manager with SSO, SQLite/PostgreSQL, and Kubernetes Secret sync"

@@ -60,10 +60,13 @@ The database stores all client data needed to restore configs:
 - assigned IPv4 address
 - public key
 - private key
+- optional owner-scoped connectivity group
 - enabled flag
 - created/updated timestamps

-The Kubernetes Secret is derived from the database. Active clients are rendered into one configured Secret key, `peers.conf` by default.
+The Kubernetes Secret is derived from the database. Active clients are rendered
+into `peers.conf`; exact same-group IPv4 pairs are rendered into
+`policy.conf`. Clients without a group are isolated from other VPN clients.

 ## Kubernetes Sync

@@ -156,18 +159,20 @@ delivered.

 ## API

-The JSON API is session-authenticated:
+The JSON API is session-authenticated unless noted:

 - `GET /api/me`
 - `GET /api/vpn-clients`
 - `GET /api/vpn-status`
 - `GET /api/telegram-link/status`
+- `POST /api/telegram-login/webapp` (public Telegram `initData` login)
 - `POST /api/telegram-link/webapp`
 - `POST /api/telegram-link/start`
 - `POST /api/telegram-link/decline`
 - `POST /api/telegram-link/unlink`
 - `POST /api/vpn-clients`
 - `POST /api/vpn-clients/{id}/enabled`
+- `POST /api/vpn-clients/{id}/group` changes the server-side connectivity group without changing the client config
 - `DELETE /api/vpn-clients/{id}`
 - `GET /api/vpn-clients/{id}/config` returns `servers[]` with one raw AWG config and one Amnezia `vpn://` import link per registered endpoint
 - `POST /api/vpn-clients/sync`
@@ -87,11 +87,13 @@ async fn me_handler(session: Session, db: Database) -> cot::Result<cot::response
 struct VpnClientsResponse {
    role: String,
    clients: Vec<vpn::VpnClientView>,
+    groups: Vec<String>,
 }

 #[derive(Debug, Deserialize, JsonSchema)]
 struct CreateVpnClientRequest {
    name: String,
+    group_name: Option<String>,
 }

 #[derive(Debug, Serialize, JsonSchema)]
@@ -106,6 +108,11 @@ struct SetEnabledRequest {
    enabled: bool,
 }

+#[derive(Debug, Deserialize, JsonSchema)]
+struct SetGroupRequest {
+    group_name: Option<String>,
+}
+
 #[derive(Debug, Serialize, JsonSchema)]
 struct DeleteVpnClientResponse {
    sync: vpn::SecretSyncResult,
@@ -162,6 +169,11 @@ struct TelegramLinkResponse {
    status: TelegramLinkStatusResponse,
 }

+#[derive(Debug, Serialize, JsonSchema)]
+struct TelegramLoginResponse {
+    redirect_to: String,
+}
+
 #[derive(Debug, Deserialize, JsonSchema)]
 struct TelegramWebAppLinkRequest {
    init_data: String,
@@ -184,6 +196,14 @@ async fn vpn_clients_handler(
        .await
        .map_err(|e| cot::Error::internal(format!("failed to list clients: {e}")))?;
    let owner_map = owner_view_map(&db, &clients).await?;
+    let mut groups = clients
+        .iter()
+        .filter(|client| client.owner_user_id() == user.id)
+        .filter_map(vpn::VpnClient::group_name_str)
+        .map(str::to_owned)
+        .collect::<Vec<_>>();
+    groups.sort();
+    groups.dedup();
    let clients = clients
        .into_iter()
        .map(|client| client_view_with_owner(client, &owner_map))
@@ -192,6 +212,7 @@ async fn vpn_clients_handler(
    Json(VpnClientsResponse {
        role: user.role.code().to_owned(),
        clients,
+        groups,
    })
    .into_response()
 }
@@ -292,6 +313,71 @@ async fn telegram_link_webapp_handler(
    .into_response()
 }

+async fn telegram_login_webapp_handler(
+    session: Session,
+    db: Database,
+    Json(request): Json<TelegramWebAppLinkRequest>,
+) -> cot::Result<cot::response::Response> {
+    let (config, _) = AppConfig::load_with_db(&db).await;
+    if !config.telegram_bot_enabled {
+        return Ok(json_error_typed(
+            cot::http::StatusCode::CONFLICT,
+            "telegram_disabled",
+            "Telegram is disabled",
+            "Telegram integration is disabled by the administrator.",
+            "",
+        ));
+    }
+
+    let telegram_user = match telegram::validate_web_app_init_data(
+        &request.init_data,
+        &config.telegram_bot_token,
+        TELEGRAM_INIT_DATA_MAX_AGE,
+    ) {
+        Ok(user) => user,
+        Err(e) => {
+            return Ok(json_error_typed(
+                cot::http::StatusCode::BAD_REQUEST,
+                "telegram_webapp_auth_failed",
+                "Telegram verification failed",
+                "Could not verify Telegram Web App data.",
+                &e.to_string(),
+            ));
+        }
+    };
+
+    let telegram_id = telegram_user.id.to_string();
+    let Some(user) = User::get_by_telegram_id(&db, &telegram_id)
+        .await
+        .map_err(|e| cot::Error::internal(format!("failed to load Telegram user: {e}")))?
+    else {
+        return Ok(json_error_typed(
+            cot::http::StatusCode::UNAUTHORIZED,
+            "telegram_account_not_linked",
+            "Telegram is not linked",
+            "This Telegram account is not connected to any VPN account.",
+            "",
+        ));
+    };
+
+    if !user.is_active() {
+        return Ok(json_error_typed(
+            cot::http::StatusCode::FORBIDDEN,
+            "user_inactive",
+            "Account is inactive",
+            "This account is inactive.",
+            "",
+        ));
+    }
+
+    auth::login(&session, user.id_val()).await?;
+
+    Json(TelegramLoginResponse {
+        redirect_to: "/configs".to_owned(),
+    })
+    .into_response()
+}
+
 async fn telegram_link_start_handler(
    session: Session,
    db: Database,
@@ -397,6 +483,7 @@ async fn create_vpn_client_handler(
        &db,
        user.id,
        &request.name,
+        request.group_name.as_deref(),
        &config.vpn_client_cidr,
    )
    .await
@@ -423,6 +510,50 @@ async fn create_vpn_client_handler(
    .into_response()
 }

+async fn set_vpn_client_group_handler(
+    session: Session,
+    db: Database,
+    Path(path): Path<ClientPath>,
+    Json(request): Json<SetGroupRequest>,
+) -> cot::Result<cot::response::Response> {
+    let user = match auth::require_user_or_redirect(&session, &db).await {
+        Ok(user) => user,
+        Err(_) => {
+            return Ok(json_error(
+                cot::http::StatusCode::UNAUTHORIZED,
+                "not authenticated",
+            ));
+        }
+    };
+
+    let Some(mut client) = vpn::VpnClient::get_visible(&db, &user, path.id)
+        .await
+        .map_err(|e| cot::Error::internal(format!("failed to load client: {e}")))?
+    else {
+        return Ok(json_error(cot::http::StatusCode::NOT_FOUND, "not found"));
+    };
+
+    if let Err(e) = client.set_group(&db, request.group_name.as_deref()).await {
+        return Ok(json_error_typed(
+            cot::http::StatusCode::BAD_REQUEST,
+            "client_group_update_failed",
+            "Could not change group",
+            "The client group was not changed.",
+            &e.to_string(),
+        ));
+    }
+    let (config, _) = AppConfig::load_with_db(&db).await;
+    let (sync, notice) = sync_after_client_mutation(&db, &config).await;
+    let owner_map = owner_view_map(&db, std::slice::from_ref(&client)).await?;
+
+    Json(MutateVpnClientResponse {
+        client: client_view_with_owner(client, &owner_map),
+        sync,
+        notice,
+    })
+    .into_response()
+}
+
 async fn set_vpn_client_enabled_handler(
    session: Session,
    db: Database,
@@ -831,6 +962,11 @@ impl App for ApiApp {
                api_post(telegram_link_webapp_handler),
                "api_telegram_link_webapp",
            ),
+            Route::with_api_handler_and_name(
+                "/telegram-login/webapp",
+                api_post(telegram_login_webapp_handler),
+                "api_telegram_login_webapp",
+            ),
            Route::with_api_handler_and_name(
                "/telegram-link/start",
                api_post(telegram_link_start_handler),
@@ -856,6 +992,11 @@ impl App for ApiApp {
                api_post(set_vpn_client_enabled_handler),
                "api_vpn_client_enabled",
            ),
+            Route::with_api_handler_and_name(
+                "/vpn-clients/{id}/group",
+                api_post(set_vpn_client_group_handler),
+                "api_vpn_client_group",
+            ),
            Route::with_api_handler_and_name(
                "/vpn-clients/{id}",
                api_delete(delete_vpn_client_handler),
@@ -42,6 +42,9 @@ translations! {
    login_submit:             "Sign in"                     , "Войти";
    login_disabled:           "Login is currently disabled." , "Вход сейчас отключён.";
    login_invalid:            "Invalid username or password." , "Неверное имя пользователя или пароль.";
+    login_telegram_wait:      "Signing in with Telegram..." , "Входим через Telegram...";
+    login_telegram_fallback:  "Open the regular login page" , "Открыть обычный вход";
+    login_telegram_failed:    "Telegram login failed. Use regular login." , "Не удалось войти через Telegram. Используйте обычный вход.";

    // Logout
    nav_logout:               "Logout"                      , "Выход";
@@ -140,6 +143,12 @@ translations! {
    configs_active_keys:      "Active"                      , "Активные";
    configs_total_keys:       "Total"                       , "Всего";
    configs_new_key:          "New key"                     , "Новый ключ";
+    configs_group:            "Group"                       , "Группа";
+    configs_group_isolated:   "Isolated"                    , "Изолирован";
+    configs_group_placeholder: "Leave empty for isolation"  , "Оставьте пустым для изоляции";
+    configs_group_hint:       "Clients with the same group name can connect to each other on the same VPN server." , "Клиенты с одинаковой группой могут обращаться друг к другу на одном VPN-сервере.";
+    configs_change_group:     "Change group"                , "Сменить группу";
+    configs_group_changed:    "Group changed. The existing client config remains valid." , "Группа изменена. Текущий конфиг клиента остаётся действительным.";
    configs_empty_title:      "Create your first key"       , "Создайте первый ключ";
    configs_empty_hint:       "It will appear here after creation." , "После создания он появится здесь.";
    configs_enabled_state:    "active"                      , "активен";
@@ -169,7 +178,7 @@ translations! {
    telegram_open_bot:        "Open bot"                    , "Открыть бота";
    telegram_guide_start:     "Open the bot and send /start once if you have not done it before." , "Откройте бота и один раз отправьте /start, если ещё не делали этого.";
    telegram_guide_get_id:    "Send the secret code below to the bot." , "Отправьте боту секретный код ниже.";
-    telegram_guide_paste:     "Return here and refresh the status." , "Вернитесь сюда и обновите статус.";
+    telegram_guide_paste:     "Return here; the status updates automatically." , "Вернитесь сюда; статус обновится автоматически.";
    telegram_secret_label:    "Secret code"                 , "Секретный код";
    telegram_save:            "Save Telegram"               , "Сохранить Telegram";
    telegram_saved:           "Telegram connected."         , "Telegram подключён.";
@@ -67,14 +67,22 @@ struct ClientPortalTemplate {
    app_version: &'static str,
 }

+#[derive(Debug, Template)]
+#[template(path = "telegram_login.html")]
+struct TelegramLoginTemplate {
+    t: &'static Translations,
+}
+
 async fn configs_page(
    session: Session,
    db: Database,
    i18n: I18n,
 ) -> cot::Result<cot::response::Response> {
-    let user = match auth::require_user_or_redirect(&session, &db).await {
-        Ok(user) => user,
-        Err(response) => return Ok(response),
+    let user = match auth::get_session_user(&session, &db).await {
+        Some(user) => user,
+        None => {
+            return Html::new(TelegramLoginTemplate { t: i18n.t }.render()?).into_response();
+        }
    };

    let is_admin = user.role == auth::Role::Admin;
@@ -31,6 +31,7 @@ pub struct VpnClient {
    address: LimitedString<64>,
    public_key: LimitedString<128>,
    private_key: LimitedString<128>,
+    group_name: Option<String>,
    enabled: bool,
    created_at: LimitedString<64>,
    updated_at: LimitedString<64>,
@@ -45,6 +46,7 @@ pub struct VpnClientView {
    pub name: String,
    pub address: String,
    pub public_key: String,
+    pub group_name: Option<String>,
    pub enabled: bool,
    pub created_at: String,
    pub updated_at: String,
@@ -88,6 +90,7 @@ impl VpnClient {
        db: &Database,
        owner_user_id: i64,
        name: &str,
+        group_name: Option<&str>,
        cidr: &str,
    ) -> cot::db::Result<Self> {
        let keypair = generate_keypair().map_err(db_custom_error)?;
@@ -103,6 +106,7 @@ impl VpnClient {
            address: LimitedString::new(address.as_str()).unwrap(),
            public_key: LimitedString::new(keypair.public_key.as_str()).unwrap(),
            private_key: LimitedString::new(keypair.private_key.as_str()).unwrap(),
+            group_name: group_name_for_storage(group_name)?,
            enabled: true,
            created_at: LimitedString::new(now.as_str()).unwrap(),
            updated_at: LimitedString::new(now.as_str()).unwrap(),
@@ -118,6 +122,22 @@ impl VpnClient {
        self.save(db).await
    }

+    pub async fn set_group(
+        &mut self,
+        db: &Database,
+        group_name: Option<&str>,
+    ) -> cot::db::Result<()> {
+        let group_name = group_name_for_storage(group_name)?;
+        if self.group_name == group_name {
+            return Ok(());
+        }
+
+        self.group_name = group_name;
+        let now = now_timestamp();
+        self.updated_at = LimitedString::new(now).unwrap();
+        self.save(db).await
+    }
+
    pub async fn delete_by_id(db: &Database, client_id: i64) -> cot::db::Result<()> {
        cot::db::query!(VpnClient, $id == Auto::Fixed(client_id))
            .delete(db)
@@ -134,6 +154,7 @@ impl VpnClient {
            name: self.name.to_string(),
            address: self.address.to_string(),
            public_key: self.public_key.to_string(),
+            group_name: self.group_name.as_ref().map(ToString::to_string),
            enabled: self.enabled,
            created_at: self.created_at.to_string(),
            updated_at: self.updated_at.to_string(),
@@ -167,6 +188,10 @@ impl VpnClient {
    pub fn private_key_str(&self) -> &str {
        &self.private_key
    }
+
+    pub fn group_name_str(&self) -> Option<&str> {
+        self.group_name.as_deref()
+    }
 }

 // ---------------------------------------------------------------------------
@@ -211,6 +236,48 @@ pub fn render_peer_secret(clients: &[VpnClient]) -> String {
    out
 }

+pub fn render_client_policy(clients: &[VpnClient], cidr: &str) -> Result<String, String> {
+    parse_ipv4_cidr(cidr)?;
+
+    let mut groups = BTreeMap::<String, Vec<Ipv4Addr>>::new();
+    for client in clients.iter().filter(|client| client.enabled()) {
+        let Some(group_name) = client.group_name_str() else {
+            continue;
+        };
+        let address = client.address_str().parse::<Ipv4Addr>().map_err(|e| {
+            format!(
+                "client {} has invalid IPv4 address {:?}: {e}",
+                client.id_val(),
+                client.address_str()
+            )
+        })?;
+        if !ipv4_is_in_cidr(address, cidr)? {
+            return Err(format!(
+                "client {} address {} is outside VPN CIDR {cidr}",
+                client.id_val(),
+                address
+            ));
+        }
+        groups
+            .entry(group_name.to_owned())
+            .or_default()
+            .push(address);
+    }
+
+    let mut out =
+        format!("# Generated by amnezia-fellow. Exact allowed awg0-to-awg0 pairs for {cidr}.\n");
+    for addresses in groups.values_mut() {
+        addresses.sort_unstable();
+        addresses.dedup();
+        for source in addresses.iter() {
+            for destination in addresses.iter().filter(|address| *address != source) {
+                out.push_str(&format!("{source}/32 {destination}/32\n"));
+            }
+        }
+    }
+    Ok(out)
+}
+
 fn client_name_for_storage(name: &str) -> cot::db::Result<LimitedString<255>> {
    let name = if name.is_empty() {
        "Amnezia client"
@@ -221,6 +288,16 @@ fn client_name_for_storage(name: &str) -> cot::db::Result<LimitedString<255>> {
        .map_err(|e| db_custom_error(format!("client name is too long: {e}")))
 }

+fn group_name_for_storage(group_name: Option<&str>) -> cot::db::Result<Option<String>> {
+    let Some(group_name) = group_name.map(str::trim).filter(|name| !name.is_empty()) else {
+        return Ok(None);
+    };
+    if group_name.len() > 255 {
+        return Err(db_custom_error("group name is too long".to_owned()));
+    }
+    Ok(Some(group_name.to_owned()))
+}
+
 fn escaped_peer_comment_value(value: &str) -> String {
    let mut escaped = String::with_capacity(value.len() + 2);
    escaped.push('"');
@@ -432,6 +509,7 @@ pub struct SecretSyncResult {
 pub async fn sync_clients_secret(
    config: &AppConfig,
    rendered_peers: String,
+    rendered_policy: String,
 ) -> Result<SecretSyncResult, String> {
    let client = Client::try_default()
        .await
@@ -439,13 +517,18 @@ pub async fn sync_clients_secret(
    let api: Api<Secret> = Api::namespaced(client, &config.k8s_namespace);

    let desired = rendered_peers.into_bytes();
+    let desired_policy = rendered_policy.into_bytes();
    let name = &config.k8s_clients_secret;
    let key = &config.k8s_clients_secret_key;
+    let policy_key = "policy.conf";

    match api.get_opt(name).await {
        Ok(Some(mut secret)) => {
            let mut data = secret.data.take().unwrap_or_default();
-            if data.get(key).map(|value| value.0.as_slice()) == Some(desired.as_slice()) {
+            if data.get(key).map(|value| value.0.as_slice()) == Some(desired.as_slice())
+                && data.get(policy_key).map(|value| value.0.as_slice())
+                    == Some(desired_policy.as_slice())
+            {
                return Ok(SecretSyncResult {
                    changed: false,
                    message: "client Secret is already up to date".to_owned(),
@@ -453,6 +536,10 @@ pub async fn sync_clients_secret(
            }

            data.insert(key.clone(), k8s_openapi::ByteString(desired));
+            data.insert(
+                policy_key.to_owned(),
+                k8s_openapi::ByteString(desired_policy),
+            );
            secret.data = Some(data);
            mark_client_secret_updated(&mut secret);
            api.replace(name, &PostParams::default(), &secret)
@@ -466,6 +553,10 @@ pub async fn sync_clients_secret(
        Ok(None) => {
            let mut data = BTreeMap::new();
            data.insert(key.clone(), k8s_openapi::ByteString(desired));
+            data.insert(
+                policy_key.to_owned(),
+                k8s_openapi::ByteString(desired_policy),
+            );
            let secret = Secret {
                metadata: ObjectMeta {
                    name: Some(name.clone()),
@@ -498,7 +589,8 @@ pub async fn sync_from_database(
    let clients = VpnClient::list_all(db)
        .await
        .map_err(|e| format!("failed to list VPN clients: {e}"))?;
-    sync_clients_secret(config, render_peer_secret(&clients)).await
+    let policy = render_client_policy(&clients, &config.vpn_client_cidr)?;
+    sync_clients_secret(config, render_peer_secret(&clients), policy).await
 }

 fn mark_client_secret_updated(secret: &mut Secret) {
@@ -920,6 +1012,16 @@ fn parse_ipv4_cidr(cidr: &str) -> Result<(Ipv4Addr, u32), String> {
    Ok((u32_to_ipv4(ipv4_to_u32(ip) & mask), prefix))
 }

+fn ipv4_is_in_cidr(address: Ipv4Addr, cidr: &str) -> Result<bool, String> {
+    let (network, prefix) = parse_ipv4_cidr(cidr)?;
+    let mask = if prefix == 0 {
+        0
+    } else {
+        u32::MAX << (32 - prefix)
+    };
+    Ok(ipv4_to_u32(address) & mask == ipv4_to_u32(network))
+}
+
 fn ipv4_to_u32(ip: Ipv4Addr) -> u32 {
    u32::from_be_bytes(ip.octets())
 }
@@ -1073,14 +1175,48 @@ pub mod db_migrations {
                "m_0008_user_telegram_link_code",
            ),
        ];
+        const OPERATIONS: &'static [Operation] = &[Operation::custom(normalize_bigint_ids).build()];
+    }
+
+    #[cot::db::migrations::migration_op]
+    async fn add_vpn_client_group_name(
+        ctx: migrations::MigrationContext<'_>,
+    ) -> cot::db::Result<()> {
+        ctx.db
+            .raw(
+                "ALTER TABLE amnezia_fellow__vpn_client \
+                 ADD COLUMN group_name VARCHAR(255)",
+            )
+            .await?;
+        ctx.db
+            .raw(
+                "CREATE INDEX idx_amnezia_fellow_vpn_client_owner_group \
+                 ON amnezia_fellow__vpn_client (owner_user_id, group_name)",
+            )
+            .await?;
+        Ok(())
+    }
+
+    #[derive(Debug, Copy, Clone)]
+    pub struct M0010VpnClientGroupName;
+
+    impl migrations::Migration for M0010VpnClientGroupName {
+        const APP_NAME: &'static str = "amnezia_fellow";
+        const MIGRATION_NAME: &'static str = "m_0010_vpn_client_group_name";
+        const DEPENDENCIES: &'static [migrations::MigrationDependency] =
+            &[migrations::MigrationDependency::migration(
+                "amnezia_fellow",
+                "m_0009_normalize_bigint_ids",
+            )];
        const OPERATIONS: &'static [Operation] =
-            &[Operation::custom(normalize_bigint_ids).build()];
+            &[Operation::custom(add_vpn_client_group_name).build()];
    }

    pub const MIGRATIONS: &[&SyncDynMigration] = &[
        &M0005CreateVpnClient,
        &M0006VpnClientIndexes,
        &M0009NormalizeBigintIds,
+        &M0010VpnClientGroupName,
    ];
 }

@@ -1088,6 +1224,21 @@ pub mod db_migrations {
 mod tests {
    use super::*;

+    fn test_client(id: i64, owner: i64, address: &str, group_name: Option<&str>) -> VpnClient {
+        VpnClient {
+            id: Auto::Fixed(id),
+            owner_user_id: owner,
+            name: LimitedString::new(format!("client-{id}")).unwrap(),
+            address: LimitedString::new(address).unwrap(),
+            public_key: LimitedString::new(format!("public-{id}")).unwrap(),
+            private_key: LimitedString::new(format!("private-{id}")).unwrap(),
+            group_name: group_name.map(str::to_owned),
+            enabled: true,
+            created_at: LimitedString::new("0").unwrap(),
+            updated_at: LimitedString::new("0").unwrap(),
+        }
+    }
+
    #[test]
    fn cidr_parser_normalizes_network() {
        let (network, prefix) = parse_ipv4_cidr("10.8.42.7/16").unwrap();
@@ -1102,6 +1253,33 @@ mod tests {
        assert_eq!(keypair.public_key.len(), 44);
    }

+    #[test]
+    fn client_policy_allows_only_exact_pairs_with_same_group() {
+        let clients = vec![
+            test_client(1, 10, "10.8.0.2", Some("home")),
+            test_client(2, 10, "10.8.0.3", Some("home")),
+            test_client(3, 10, "10.8.0.4", Some("other")),
+            test_client(4, 11, "10.8.0.5", Some("home")),
+            test_client(5, 10, "10.8.0.6", None),
+        ];
+
+        let policy = render_client_policy(&clients, "10.8.0.0/16").unwrap();
+        assert!(policy.contains("10.8.0.2/32 10.8.0.3/32\n"));
+        assert!(policy.contains("10.8.0.3/32 10.8.0.2/32\n"));
+        assert!(policy.contains("10.8.0.2/32 10.8.0.5/32\n"));
+        assert!(policy.contains("10.8.0.5/32 10.8.0.2/32\n"));
+        assert_eq!(
+            policy.lines().filter(|line| !line.starts_with('#')).count(),
+            6
+        );
+    }
+
+    #[test]
+    fn client_policy_rejects_address_outside_vpn_cidr() {
+        let clients = vec![test_client(1, 10, "192.0.2.2", Some("home"))];
+        assert!(render_client_policy(&clients, "10.8.0.0/16").is_err());
+    }
+
    #[test]
    fn endpoint_parser_accepts_ipv4_and_bracketed_ipv6() {
        assert_eq!(
@@ -1145,6 +1323,7 @@ mod tests {
            address: LimitedString::new("10.8.0.2").unwrap(),
            public_key: LimitedString::new("client-public-key").unwrap(),
            private_key: LimitedString::new("client-private-key").unwrap(),
+            group_name: None,
            enabled: true,
            created_at: LimitedString::new("2026-06-16T00:00:00Z").unwrap(),
            updated_at: LimitedString::new("2026-06-16T00:00:00Z").unwrap(),
@@ -1210,6 +1389,7 @@ mod tests {
            address: LimitedString::new("10.8.0.2").unwrap(),
            public_key: LimitedString::new("client-public-key").unwrap(),
            private_key: LimitedString::new("client-private-key").unwrap(),
+            group_name: None,
            enabled: true,
            created_at: LimitedString::new("2026-06-16T00:00:00Z").unwrap(),
            updated_at: LimitedString::new("2026-06-16T00:00:00Z").unwrap(),
@@ -9,13 +9,13 @@
    * { box-sizing: border-box; }
    [x-cloak] { display: none !important; }
    body { margin: 0; min-height: 100vh; background: #edf3ef; color: #18232d; font-family: system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", sans-serif; }
-    button, input { font: inherit; }
+    button, input, select { font: inherit; }
    button { min-height: 40px; border: 1px solid #18342f; border-radius: 8px; padding: .55rem .85rem; background: #18342f; color: #fff; cursor: pointer; font-weight: 750; }
    button.secondary { background: #fff; color: #18342f; border-color: #c7d4ce; }
    button.ghost { background: transparent; color: #42515d; border-color: transparent; }
    button.danger { background: #a8312d; border-color: #a8312d; color: #fff; }
    button:disabled { opacity: .48; cursor: default; }
-    input { width: 100%; min-height: 42px; border: 1px solid #c7d4ce; border-radius: 8px; padding: .55rem .7rem; color: #18232d; background: #fff; }
+    input, select { width: 100%; min-height: 42px; border: 1px solid #c7d4ce; border-radius: 8px; padding: .55rem .7rem; color: #18232d; background: #fff; }
    code { display: inline-block; max-width: 100%; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; border-radius: 6px; background: #f1f4f2; color: #26313a; padding: .18rem .4rem; font-family: ui-monospace, SFMono-Regular, Menlo, Consolas, monospace; font-size: .82rem; }
    .portal { min-height: 100vh; display: flex; flex-direction: column; }
    .topbar { position: sticky; top: 0; z-index: 10; background: rgba(255,255,255,.94); border-bottom: 1px solid #d6dfda; backdrop-filter: blur(12px); }
@@ -62,7 +62,8 @@
    .server-status-name { overflow: hidden; text-overflow: ellipsis; white-space: nowrap; color: #18232d; font-size: .86rem; font-weight: 850; }
    .server-status-label { overflow: hidden; text-overflow: ellipsis; white-space: nowrap; color: #69777f; font-size: .74rem; font-weight: 750; }
    .server-status-muted { color: #69777f; font-size: .82rem; }
-    .create { display: grid; grid-template-columns: minmax(0, 1fr) auto; gap: .65rem; padding: 0 1rem 1rem; align-items: end; }
+    .create { display: flex; justify-content: flex-end; padding: 0 1rem 1rem; }
+    .create-plus { width: 44px; min-width: 44px; height: 44px; padding: 0; font-size: 1.55rem; line-height: 1; }
    .field { display: grid; gap: .32rem; min-width: 0; }
    .field label { color: #34424b; font-size: .83rem; font-weight: 800; }
    .notice { border: 1px solid #d6dfda; border-left-width: 4px; border-radius: 8px; background: #fff; padding: .75rem .85rem; display: grid; gap: .25rem; box-shadow: 0 8px 24px rgba(24, 52, 47, .06); }
@@ -87,7 +88,7 @@
    .meta-grid { display: grid; grid-template-columns: repeat(2, minmax(0, 1fr)); gap: .55rem; }
    .meta-item { min-width: 0; display: grid; gap: .24rem; }
    .meta-label { color: #69777f; font-size: .77rem; font-weight: 800; }
-    .key-actions { display: grid; grid-template-columns: minmax(0, 1fr) auto auto; gap: .5rem; align-items: center; }
+    .key-actions { display: grid; grid-template-columns: minmax(0, 1fr) auto auto auto; gap: .5rem; align-items: center; }
    .key-actions .server-button { justify-self: stretch; }
    .key-updated { color: #69777f; font-size: .82rem; overflow-wrap: anywhere; }
    .backdrop { position: fixed; inset: 0; z-index: 30; display: grid; place-items: center; padding: 1rem; background: rgba(16, 28, 36, .42); }
@@ -115,12 +116,14 @@
    .modal-actions { display: flex; justify-content: flex-end; gap: .5rem; flex-wrap: wrap; }
    .telegram-sheet { width: min(480px, 100%); }
    .telegram-copy { color: #53616c; line-height: 1.45; margin: 0; }
+    .form-stack { display: grid; gap: .8rem; }
+    .field-hint { margin: 0; color: #69777f; font-size: .82rem; line-height: 1.4; }
    .guide-list { margin: 0; padding-left: 1.2rem; color: #34424b; display: grid; gap: .45rem; line-height: 1.4; }
    .guide-list a { color: #18342f; font-weight: 850; }
    .guide-list a.disabled { color: #69777f; pointer-events: none; text-decoration: none; }
    .secret-box { display: grid; gap: .35rem; border: 1px solid #d6dfda; border-radius: 8px; background: #f7faf8; padding: .7rem; }
    .secret-box code { display: block; padding: .55rem .65rem; font-size: .92rem; white-space: normal; overflow-wrap: anywhere; }
-    @media (max-width: 720px) {
+    @media (max-width: 900px) {
        .topbar-inner { align-items: flex-start; flex-direction: column; }
        .top-actions { width: 100%; justify-content: space-between; }
        .user-pill { max-width: 100%; }
@@ -219,11 +222,7 @@
                </template>
            </div>
            <div class="create">
-                <div class="field">
-                    <label for="client-name">{{ t.configs_new_key }}</label>
-                    <input id="client-name" x-model="newName" @keydown.enter.prevent="createClient()" placeholder="{{ t.configs_name_placeholder }}">
-                </div>
-                <button type="button" @click="createClient()" :disabled="busy">{{ t.configs_create }}</button>
+                <button type="button" class="create-plus" @click="openCreateClient()" :disabled="busy" title="{{ t.configs_new_key }}" aria-label="{{ t.configs_new_key }}">+</button>
            </div>
        </section>

@@ -265,10 +264,15 @@
                                <span class="meta-label">{{ t.configs_public_key }}</span>
                                <code x-text="shortKey(client.public_key)"></code>
                            </div>
+                            <div class="meta-item">
+                                <span class="meta-label">{{ t.configs_group }}</span>
+                                <code x-text="client.group_name || '{{ t.configs_group_isolated }}'"></code>
+                            </div>
                        </div>

                        <div class="key-actions">
                            <button type="button" class="server-button" @click="openServers(client)" :disabled="busy || !client.enabled">{{ t.configs_choose_server }}</button>
+                            <button type="button" class="secondary" @click="openGroupEditor(client)" :disabled="busy">{{ t.configs_change_group }}</button>
                            <button type="button" class="secondary" @click="setEnabled(client, !client.enabled)" :disabled="busy" x-text="client.enabled ? '{{ t.configs_disable }}' : '{{ t.configs_enable }}'"></button>
                            <button type="button" class="danger" @click="deleteClient(client)" :disabled="busy">{{ t.users_delete }}</button>
                        </div>
@@ -280,6 +284,42 @@
        </template>
    </main>

+    <template x-if="clientModal">
+        <div class="backdrop" x-cloak @click.self="closeClientModal()">
+            <section class="sheet">
+                <div class="sheet-head">
+                    <div class="sheet-title">
+                        <h2 x-text="clientModal.mode === 'create' ? '{{ t.configs_new_key }}' : '{{ t.configs_change_group }}'"></h2>
+                        <span x-show="clientModal.client" x-text="clientModal.client ? clientModal.client.name : ''"></span>
+                    </div>
+                    <button type="button" class="ghost" @click="closeClientModal()">{{ t.admin_close }}</button>
+                </div>
+                <div class="form-stack">
+                    <template x-if="clientModal.mode === 'create'">
+                        <div class="field">
+                            <label for="client-modal-name">{{ t.configs_name }}</label>
+                            <input id="client-modal-name" x-model="clientModal.name" placeholder="{{ t.configs_name_placeholder }}">
+                        </div>
+                    </template>
+                    <div class="field">
+                        <label for="client-modal-group">{{ t.configs_group }}</label>
+                        <input id="client-modal-group" x-model="clientModal.groupName" list="vpn-client-groups" placeholder="{{ t.configs_group_placeholder }}">
+                        <datalist id="vpn-client-groups">
+                            <template x-for="group in groups" :key="group">
+                                <option :value="group"></option>
+                            </template>
+                        </datalist>
+                        <p class="field-hint">{{ t.configs_group_hint }}</p>
+                    </div>
+                </div>
+                <div class="modal-actions">
+                    <button type="button" class="secondary" @click="closeClientModal()">{{ t.admin_close }}</button>
+                    <button type="button" @click="clientModal.mode === 'create' ? createClient() : changeClientGroup()" :disabled="busy">{{ t.settings_save }}</button>
+                </div>
+            </section>
+        </div>
+    </template>
+
    <template x-if="serverModal">
        <div class="backdrop" x-cloak @click.self="closeServers()">
            <section class="sheet">
@@ -433,7 +473,8 @@
 function clientPortal() {
    return {
        clients: [],
-        newName: '',
+        groups: [],
+        clientModal: null,
        busy: false,
        status: '',
        error: '',
@@ -461,12 +502,15 @@ function clientPortal() {
        telegramModal: null,
        telegramBusy: false,
        telegramPromptChecked: false,
+        telegramStatusTimer: null,
+        telegramStatusPolling: false,
        init() {
            this.initTelegramWebApp();
            this.load();
            this.loadServerStatus();
            this.loadTelegramStatus();
            this.serverStatusTimer = setInterval(() => this.loadServerStatus(true), 30000);
+            this.telegramStatusTimer = setInterval(() => this.pollTelegramStatus(), 2500);
        },
        async request(url, options = {}) {
            const response = await fetch(url, {
@@ -490,6 +534,7 @@ function clientPortal() {
            try {
                const data = await this.request('/api/vpn-clients');
                this.clients = data.clients || [];
+                this.groups = data.groups || [];
            } catch (e) {
                this.showError(e);
            } finally {
@@ -517,11 +562,11 @@ function clientPortal() {
            this.telegram.isWebApp = Boolean(webApp.initData);
            this.telegram.initData = webApp.initData || '';
        },
-        async loadTelegramStatus() {
+        async loadTelegramStatus(options = {}) {
            try {
                const status = await this.request('/api/telegram-link/status');
                this.applyTelegramStatus(status);
-                this.maybePromptTelegram();
+                if (options.prompt !== false) this.maybePromptTelegram();
            } catch (e) {
                console.warn('telegram status failed', e);
            }
@@ -596,6 +641,25 @@ function clientPortal() {
                this.telegramBusy = false;
            }
        },
+        async pollTelegramStatus() {
+            if (this.telegramStatusPolling || this.telegramBusy) return;
+            if (!this.telegram.enabled || !this.telegram.pending) return;
+            if (this.telegramModal !== 'manualGuide' && this.telegramModal !== 'manage') return;
+
+            this.telegramStatusPolling = true;
+            const wasPending = this.telegram.pending;
+            try {
+                await this.loadTelegramStatus({ prompt: false });
+                if (wasPending && this.telegram.linked) {
+                    this.telegramModal = 'manage';
+                    this.setNotice('success', '{{ t.notice_success_title }}', '{{ t.telegram_saved }}');
+                } else if (wasPending && !this.telegram.pending) {
+                    this.telegramModal = 'manage';
+                }
+            } finally {
+                this.telegramStatusPolling = false;
+            }
+        },
        async copyTelegramSecret() {
            if (!this.telegram.pending_secret) return;
            this.clearNotice();
@@ -658,17 +722,42 @@ function clientPortal() {
            if (this.telegram.linked) return '{{ t.telegram_connected_message }}';
            return '{{ t.telegram_not_connected_message }}';
        },
+        openCreateClient() {
+            this.clientModal = { mode: 'create', name: '', groupName: '', client: null };
+        },
+        openGroupEditor(client) {
+            this.clientModal = {
+                mode: 'group',
+                name: client.name || '',
+                groupName: client.group_name || '',
+                client,
+            };
+        },
+        closeClientModal() {
+            if (!this.busy) this.clientModal = null;
+        },
+        rememberGroup(groupName) {
+            const group = String(groupName || '').trim();
+            if (group && !this.groups.includes(group)) {
+                this.groups.push(group);
+                this.groups.sort((left, right) => left.localeCompare(right));
+            }
+        },
        async createClient() {
+            if (!this.clientModal || this.clientModal.mode !== 'create') return;
            this.clearNotice();
            this.busy = true;
            try {
+                const name = this.clientModal.name;
+                const groupName = this.clientModal.groupName.trim() || null;
                const data = await this.request('/api/vpn-clients', {
                    method: 'POST',
-                    body: JSON.stringify({ name: this.newName }),
+                    body: JSON.stringify({ name, group_name: groupName }),
                });
                this.clients.push(data.client);
                delete this.serverConfigs[data.client.id];
-                this.newName = '';
+                this.rememberGroup(data.client.group_name);
+                this.clientModal = null;
                this.applyResponseNotice(data, '{{ t.notice_create_success }}');
            } catch (e) {
                this.showError(e);
@@ -676,6 +765,33 @@ function clientPortal() {
                this.busy = false;
            }
        },
+        async changeClientGroup() {
+            if (!this.clientModal || this.clientModal.mode !== 'group') return;
+            const client = this.clientModal.client;
+            const groupName = this.clientModal.groupName.trim() || null;
+            if ((client.group_name || null) === groupName) {
+                this.clientModal = null;
+                return;
+            }
+            this.clearNotice();
+            this.busy = true;
+            try {
+                const data = await this.request(`/api/vpn-clients/${client.id}/group`, {
+                    method: 'POST',
+                    body: JSON.stringify({ group_name: groupName }),
+                });
+                const index = this.clients.findIndex((item) => item.id === client.id);
+                if (index !== -1) this.clients[index] = data.client;
+                delete this.serverConfigs[client.id];
+                this.rememberGroup(data.client.group_name);
+                this.clientModal = null;
+                this.applyResponseNotice(data, '{{ t.configs_group_changed }}');
+            } catch (e) {
+                this.showError(e);
+            } finally {
+                this.busy = false;
+            }
+        },
        async setEnabled(client, enabled) {
            this.clearNotice();
            this.busy = true;
@@ -41,7 +41,22 @@
    button.secondary { background: #fff; color: #17202a; border-color: #cbd3db; }
    button.danger { background: #9d2323; border-color: #9d2323; }
    button:disabled { opacity: .55; cursor: default; }
-    table { width: 100%; border-collapse: collapse; background: #fff; border: 1px solid #dde2e6; border-radius: 6px; overflow: hidden; }
+    .config-table { width: 100%; border-collapse: collapse; background: #fff; border: 1px solid #dde2e6; border-radius: 6px; overflow: hidden; }
+    .mobile-client-list { display: none; }
+    .mobile-owner-group { display: grid; gap: .55rem; }
+    .mobile-owner-head { display: flex; align-items: center; justify-content: space-between; gap: .5rem; color: #34414f; font-size: .86rem; font-weight: 750; }
+    .mobile-client-card { min-width: 0; border: 1px solid #dde2e6; border-radius: 8px; background: #fff; padding: .75rem; display: grid; gap: .65rem; box-shadow: 0 4px 16px rgba(23, 32, 42, .05); }
+    .mobile-client-head { min-width: 0; display: flex; align-items: flex-start; justify-content: space-between; gap: .55rem; }
+    .mobile-client-name { min-width: 0; font-weight: 800; overflow-wrap: anywhere; }
+    .mobile-client-state { flex: 0 0 auto; border-radius: 999px; padding: .15rem .45rem; background: #e8ecef; color: #53606d; font-size: .72rem; font-weight: 750; }
+    .mobile-client-state.enabled { background: #dcefe4; color: #175c31; }
+    .mobile-client-meta { min-width: 0; display: grid; grid-template-columns: repeat(2, minmax(0, 1fr)); gap: .55rem; }
+    .mobile-meta-item { min-width: 0; display: grid; gap: .18rem; }
+    .mobile-meta-item.full { grid-column: 1 / -1; }
+    .mobile-meta-label { color: #6a7682; font-size: .72rem; font-weight: 700; }
+    .mobile-meta-value { min-width: 0; overflow-wrap: anywhere; }
+    .mobile-client-actions { display: grid; grid-template-columns: repeat(2, minmax(0, 1fr)); gap: .4rem; }
+    .mobile-client-actions button { width: 100%; min-width: 0; padding-inline: .4rem; white-space: normal; }
    th, td { text-align: left; padding: .65rem .75rem; border-bottom: 1px solid #edf0f2; font-size: .92rem; vertical-align: middle; }
    th { background: #eef1f4; font-weight: 650; color: #34414f; }
    tr:last-child td { border-bottom: 0; }
@@ -120,17 +135,18 @@
    .guide-list a.disabled { color: #6a7682; pointer-events: none; text-decoration: none; }
    .secret-box { display: grid; gap: .35rem; border: 1px solid #dde2e6; border-radius: 6px; background: #f8fafb; padding: .7rem; }
    .secret-box code { display: block; padding: .55rem .65rem; font-size: .92rem; white-space: normal; overflow-wrap: anywhere; }
-    @media (max-width: 760px) {
+    @media (max-width: 980px) {
        .shell { grid-template-columns: 1fr; }
-        .sidebar { display: flex; align-items: center; gap: .75rem; overflow-x: auto; }
+        .sidebar { display: flex; align-items: center; gap: .75rem; flex-wrap: wrap; overflow-x: visible; }
        .sidebar h1 { margin: 0; white-space: nowrap; }
        .sidebar a { margin: 0; white-space: nowrap; }
        .toolbar { align-items: stretch; flex-direction: column; }
        .actions { align-items: stretch; }
        .actions input, .actions button { width: 100%; }
        .main { padding: 1rem; }
-        table { display: block; overflow-x: auto; }
-        .row-actions { align-items: stretch; }
+        .desktop-client-table { display: none; }
+        .mobile-client-list { display: grid; gap: .9rem; min-width: 0; }
+        .mobile-client-card code { display: block; max-width: 100%; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
        .servers-modal { width: 100%; max-height: calc(100vh - 2rem); }
        .server-card-actions { grid-template-columns: 1fr; }
        .server-card-actions button { flex: 1 1 100%; }
@@ -169,8 +185,7 @@
            <div class="toolbar">
                <h2>{{ t.configs_heading }}</h2>
                <div class="actions">
-                    <input x-model="newName" placeholder="{{ t.configs_name_placeholder }}">
-                    <button @click="createClient()" :disabled="busy">{{ t.configs_create }}</button>
+                    <button @click="openCreateClient()" :disabled="busy">+ {{ t.configs_create }}</button>
                    {% if is_admin %}
                    <button class="secondary" @click="sync()" :disabled="busy">{{ t.configs_sync }}</button>
                    {% endif %}
@@ -232,7 +247,7 @@
            </template>

            <template x-if="clients.length > 0">
-                <table>
+                <table class="config-table desktop-client-table">
                    <thead>
                        <tr>
                            <th>{{ t.configs_name }}</th>
@@ -241,6 +256,7 @@
                            {% endif %}
                            <th>{{ t.configs_address }}</th>
                            <th>{{ t.configs_public_key }}</th>
+                            <th>{{ t.configs_group }}</th>
                            <th>{{ t.configs_enabled }}</th>
                            <th>{{ t.users_actions }}</th>
                        </tr>
@@ -249,7 +265,7 @@
                        <tbody>
                            {% if is_admin %}
                            <tr class="owner-row">
-                                <td colspan="6">
+                                <td colspan="7">
                                    <span x-text="group.label"></span>
                                    <span class="owner-meta" x-text="`(${group.clients.length})`"></span>
                                </td>
@@ -257,16 +273,18 @@
                            {% endif %}
                            <template x-for="client in group.clients" :key="client.id">
                                <tr>
-                                    <td x-text="client.name"></td>
+                                    <td class="client-name-cell" data-label="{{ t.configs_name }}" x-text="client.name"></td>
                                    {% if is_admin %}
-                                    <td x-text="ownerLabel(client)"></td>
+                                    <td data-label="{{ t.configs_owner }}" x-text="ownerLabel(client)"></td>
                                    {% endif %}
-                                    <td><code x-text="client.address + '/32'"></code></td>
-                                    <td><code x-text="shortKey(client.public_key)"></code></td>
-                                    <td x-text="client.enabled ? '{{ t.configs_yes }}' : '{{ t.configs_no }}'"></td>
-                                    <td>
+                                    <td data-label="{{ t.configs_address }}"><code x-text="client.address + '/32'"></code></td>
+                                    <td data-label="{{ t.configs_public_key }}"><code x-text="shortKey(client.public_key)"></code></td>
+                                    <td data-label="{{ t.configs_group }}" x-text="client.group_name || '{{ t.configs_group_isolated }}'"></td>
+                                    <td data-label="{{ t.configs_enabled }}" x-text="client.enabled ? '{{ t.configs_yes }}' : '{{ t.configs_no }}'"></td>
+                                    <td class="client-actions-cell" data-label="{{ t.users_actions }}">
                                        <div class="row-actions">
                                            <button class="secondary" @click="openServers(client)" :disabled="busy">{{ t.configs_servers }}</button>
+                                            <button class="secondary" @click="openGroupEditor(client)" :disabled="busy">{{ t.configs_change_group }}</button>
                                            <button class="secondary" @click="setEnabled(client, !client.enabled)" :disabled="busy" x-text="client.enabled ? '{{ t.configs_disable }}' : '{{ t.configs_enable }}'"></button>
                                            <button class="danger" @click="deleteClient(client)" :disabled="busy">{{ t.users_delete }}</button>
                                        </div>
@@ -276,10 +294,84 @@
                        </tbody>
                    </template>
                </table>
+
+                <div class="mobile-client-list">
+                    <template x-for="ownerGroup in groupedClients()" :key="`mobile-${ownerGroup.key}`">
+                        <section class="mobile-owner-group">
+                            <div class="mobile-owner-head">
+                                <span x-text="ownerGroup.label"></span>
+                                <span x-text="ownerGroup.clients.length"></span>
+                            </div>
+                            <template x-for="client in ownerGroup.clients" :key="`mobile-client-${client.id}`">
+                                <article class="mobile-client-card">
+                                    <div class="mobile-client-head">
+                                        <span class="mobile-client-name" x-text="client.name"></span>
+                                        <span class="mobile-client-state" :class="{ enabled: client.enabled }" x-text="client.enabled ? '{{ t.configs_enabled_state }}' : '{{ t.configs_disabled_state }}'"></span>
+                                    </div>
+                                    <div class="mobile-client-meta">
+                                        <div class="mobile-meta-item">
+                                            <span class="mobile-meta-label">{{ t.configs_address }}</span>
+                                            <code class="mobile-meta-value" x-text="client.address + '/32'"></code>
+                                        </div>
+                                        <div class="mobile-meta-item">
+                                            <span class="mobile-meta-label">{{ t.configs_group }}</span>
+                                            <span class="mobile-meta-value" x-text="client.group_name || '{{ t.configs_group_isolated }}'"></span>
+                                        </div>
+                                        <div class="mobile-meta-item full">
+                                            <span class="mobile-meta-label">{{ t.configs_public_key }}</span>
+                                            <code class="mobile-meta-value" x-text="shortKey(client.public_key)"></code>
+                                        </div>
+                                    </div>
+                                    <div class="mobile-client-actions">
+                                        <button class="secondary" @click="openServers(client)" :disabled="busy">{{ t.configs_servers }}</button>
+                                        <button class="secondary" @click="openGroupEditor(client)" :disabled="busy">{{ t.configs_change_group }}</button>
+                                        <button class="secondary" @click="setEnabled(client, !client.enabled)" :disabled="busy" x-text="client.enabled ? '{{ t.configs_disable }}' : '{{ t.configs_enable }}'"></button>
+                                        <button class="danger" @click="deleteClient(client)" :disabled="busy">{{ t.users_delete }}</button>
+                                    </div>
+                                </article>
+                            </template>
+                        </section>
+                    </template>
+                </div>
            </template>
        </main>
    </div>

+    <template x-if="clientModal">
+        <div class="modal-backdrop" @click.self="closeClientModal()">
+            <div class="modal">
+                <div class="modal-head">
+                    <div class="modal-title">
+                        <h3 x-text="clientModal.mode === 'create' ? '{{ t.configs_new_key }}' : '{{ t.configs_change_group }}'"></h3>
+                        <span class="modal-subtitle" x-show="clientModal.client" x-text="clientModal.client ? clientModal.client.name : ''"></span>
+                    </div>
+                    <button class="secondary" @click="closeClientModal()">{{ t.admin_close }}</button>
+                </div>
+                <template x-if="clientModal.mode === 'create'">
+                    <div class="detail-row">
+                        <label class="detail-label" for="admin-client-name">{{ t.configs_name }}</label>
+                        <input id="admin-client-name" x-model="clientModal.name" placeholder="{{ t.configs_name_placeholder }}">
+                    </div>
+                </template>
+                <div class="detail-row">
+                    <label class="detail-label" for="admin-client-group">{{ t.configs_group }}</label>
+                    <div>
+                        <input id="admin-client-group" x-model="clientModal.groupName" list="admin-vpn-client-groups" placeholder="{{ t.configs_group_placeholder }}">
+                        <datalist id="admin-vpn-client-groups">
+                            <template x-for="group in groups" :key="group">
+                                <option :value="group"></option>
+                            </template>
+                        </datalist>
+                    </div>
+                </div>
+                <div class="modal-actions">
+                    <button class="secondary" @click="closeClientModal()">{{ t.admin_close }}</button>
+                    <button @click="clientModal.mode === 'create' ? createClient() : changeClientGroup()" :disabled="busy">{{ t.settings_save }}</button>
+                </div>
+            </div>
+        </div>
+    </template>
+
    <template x-if="rolloutModal">
        <div class="modal-backdrop" @click.self="closeRollout()">
            <div class="modal servers-modal">
@@ -451,7 +543,8 @@
 function configsPage() {
    return {
        clients: [],
-        newName: '',
+        groups: [],
+        clientModal: null,
        busy: false,
        status: '',
        error: '',
@@ -480,6 +573,8 @@ function configsPage() {
        telegramModal: null,
        telegramBusy: false,
        telegramPromptChecked: false,
+        telegramStatusTimer: null,
+        telegramStatusPolling: false,
        isAdmin: {% if is_admin %}true{% else %}false{% endif %},
        init() {
            this.initTelegramWebApp();
@@ -489,6 +584,7 @@ function configsPage() {
                this.loadRolloutStatus();
                this.rolloutTimer = setInterval(() => this.loadRolloutStatus(), 10000);
            }
+            this.telegramStatusTimer = setInterval(() => this.pollTelegramStatus(), 2500);
        },
        async request(url, options = {}) {
            const response = await fetch(url, {
@@ -516,11 +612,11 @@ function configsPage() {
            this.telegram.isWebApp = Boolean(webApp.initData);
            this.telegram.initData = webApp.initData || '';
        },
-        async loadTelegramStatus() {
+        async loadTelegramStatus(options = {}) {
            try {
                const status = await this.request('/api/telegram-link/status');
                this.applyTelegramStatus(status);
-                this.maybePromptTelegram();
+                if (options.prompt !== false) this.maybePromptTelegram();
            } catch (e) {
                console.warn('telegram status failed', e);
            }
@@ -595,6 +691,25 @@ function configsPage() {
                this.telegramBusy = false;
            }
        },
+        async pollTelegramStatus() {
+            if (this.telegramStatusPolling || this.telegramBusy) return;
+            if (!this.telegram.enabled || !this.telegram.pending) return;
+            if (this.telegramModal !== 'manualGuide' && this.telegramModal !== 'manage') return;
+
+            this.telegramStatusPolling = true;
+            const wasPending = this.telegram.pending;
+            try {
+                await this.loadTelegramStatus({ prompt: false });
+                if (wasPending && this.telegram.linked) {
+                    this.telegramModal = 'manage';
+                    this.setNotice('success', '{{ t.notice_success_title }}', '{{ t.telegram_saved }}');
+                } else if (wasPending && !this.telegram.pending) {
+                    this.telegramModal = 'manage';
+                }
+            } finally {
+                this.telegramStatusPolling = false;
+            }
+        },
        async copyTelegramSecret() {
            if (!this.telegram.pending_secret) return;
            this.clearNotice();
@@ -663,23 +778,49 @@ function configsPage() {
            try {
                const data = await this.request('/api/vpn-clients');
                this.clients = data.clients;
+                this.groups = data.groups || [];
            } catch (e) {
                this.error = e.message;
            } finally {
                this.busy = false;
            }
        },
+        openCreateClient() {
+            this.clientModal = { mode: 'create', name: '', groupName: '', client: null };
+        },
+        openGroupEditor(client) {
+            this.clientModal = {
+                mode: 'group',
+                name: client.name || '',
+                groupName: client.group_name || '',
+                client,
+            };
+        },
+        closeClientModal() {
+            if (!this.busy) this.clientModal = null;
+        },
+        rememberGroup(groupName) {
+            const group = String(groupName || '').trim();
+            if (group && !this.groups.includes(group)) {
+                this.groups.push(group);
+                this.groups.sort((left, right) => left.localeCompare(right));
+            }
+        },
        async createClient() {
+            if (!this.clientModal || this.clientModal.mode !== 'create') return;
            this.clearNotice();
            this.busy = true;
            try {
+                const name = this.clientModal.name;
+                const groupName = this.clientModal.groupName.trim() || null;
                const data = await this.request('/api/vpn-clients', {
                    method: 'POST',
-                    body: JSON.stringify({ name: this.newName }),
+                    body: JSON.stringify({ name, group_name: groupName }),
                });
                this.clients.push(data.client);
                delete this.serverConfigs[data.client.id];
-                this.newName = '';
+                this.rememberGroup(data.client.group_name);
+                this.clientModal = null;
                this.applyResponseNotice(data, '{{ t.notice_create_success }}');
                if (this.isAdmin) await this.loadRolloutStatus();
            } catch (e) {
@@ -688,6 +829,34 @@ function configsPage() {
                this.busy = false;
            }
        },
+        async changeClientGroup() {
+            if (!this.clientModal || this.clientModal.mode !== 'group') return;
+            const client = this.clientModal.client;
+            const groupName = this.clientModal.groupName.trim() || null;
+            if ((client.group_name || null) === groupName) {
+                this.clientModal = null;
+                return;
+            }
+            this.clearNotice();
+            this.busy = true;
+            try {
+                const data = await this.request(`/api/vpn-clients/${client.id}/group`, {
+                    method: 'POST',
+                    body: JSON.stringify({ group_name: groupName }),
+                });
+                const index = this.clients.findIndex((item) => item.id === client.id);
+                if (index !== -1) this.clients[index] = data.client;
+                delete this.serverConfigs[client.id];
+                this.rememberGroup(data.client.group_name);
+                this.clientModal = null;
+                this.applyResponseNotice(data, '{{ t.configs_group_changed }}');
+                if (this.isAdmin) await this.loadRolloutStatus();
+            } catch (e) {
+                this.showError(e);
+            } finally {
+                this.busy = false;
+            }
+        },
        async setEnabled(client, enabled) {
            this.clearNotice();
            this.busy = true;
@@ -3,6 +3,7 @@
 {% block title %}{{ t.login_heading }} | {{ t.site_name }}{% endblock title %}

 {% block head_extra %}
+<script src="https://telegram.org/js/telegram-web-app.js"></script>
 <style>
    * { margin: 0; padding: 0; box-sizing: border-box; }
    body { font-family: system-ui, -apple-system, sans-serif; background: #f5f5f5; color: #333; display: flex; justify-content: center; align-items: center; min-height: 100vh; }
@@ -30,6 +31,7 @@
    {% if !message.is_empty() %}
    <div class="flash">{{ message }}</div>
    {% endif %}
+    <div id="telegram-login-flash" class="flash" style="display: none;"></div>

    {% if !auth_password_enabled && !auth_sso_enabled %}
    <p class="message">{{ t.login_disabled }}</p>
@@ -53,4 +55,37 @@
    <a class="sso-btn" href="/auth/oidc/start">{{ oidc_button_text }}</a>
    {% endif %}
 </div>
+
+<script>
+(async () => {
+    const webApp = window.Telegram && window.Telegram.WebApp;
+    if (!webApp || !webApp.initData) return;
+
+    try {
+        webApp.ready();
+        webApp.expand();
+    } catch (_) {}
+
+    try {
+        const response = await fetch('/api/telegram-login/webapp', {
+            method: 'POST',
+            credentials: 'same-origin',
+            headers: { 'content-type': 'application/json' },
+            body: JSON.stringify({ init_data: webApp.initData }),
+        });
+        const data = await response.json().catch(() => ({}));
+        if (response.ok) {
+            window.location.replace(data.redirect_to || '/configs');
+            return;
+        }
+        const flash = document.getElementById('telegram-login-flash');
+        flash.textContent = data.error || data.detail || '{{ t.login_telegram_failed }}';
+        flash.style.display = 'block';
+    } catch (_) {
+        const flash = document.getElementById('telegram-login-flash');
+        flash.textContent = '{{ t.login_telegram_failed }}';
+        flash.style.display = 'block';
+    }
+})();
+</script>
 {% endblock body %}
@@ -0,0 +1,62 @@
+{% extends "base.html" %}
+
+{% block title %}{{ t.login_heading }} | {{ t.site_name }}{% endblock title %}
+
+{% block head_extra %}
+<script src="https://telegram.org/js/telegram-web-app.js"></script>
+<style>
+    * { box-sizing: border-box; }
+    body { margin: 0; min-height: 100vh; display: grid; place-items: center; padding: 1rem; background: #f5f5f5; color: #333; font-family: system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", sans-serif; }
+    .telegram-login-card { width: min(380px, 100%); border-radius: 8px; background: #fff; box-shadow: 0 2px 8px rgba(0,0,0,.12); padding: 2rem; text-align: center; display: grid; gap: .8rem; }
+    .telegram-login-card h1 { margin: 0; font-size: 1.35rem; }
+    .telegram-login-card p { margin: 0; color: #666; line-height: 1.45; }
+    .telegram-login-card a { color: #1a1a2e; font-weight: 700; }
+</style>
+{% endblock head_extra %}
+
+{% block body %}
+<div class="telegram-login-card">
+    <h1>{{ t.login_heading }}</h1>
+    <p id="telegram-login-status">{{ t.login_telegram_wait }}</p>
+    <a href="/login">{{ t.login_telegram_fallback }}</a>
+</div>
+
+<script>
+(async () => {
+    const status = document.getElementById('telegram-login-status');
+    const fallback = () => window.location.replace('/login');
+    const webApp = window.Telegram && window.Telegram.WebApp;
+
+    try {
+        if (webApp) {
+            webApp.ready();
+            webApp.expand();
+        }
+    } catch (_) {}
+
+    if (!webApp || !webApp.initData) {
+        fallback();
+        return;
+    }
+
+    try {
+        const response = await fetch('/api/telegram-login/webapp', {
+            method: 'POST',
+            credentials: 'same-origin',
+            headers: { 'content-type': 'application/json' },
+            body: JSON.stringify({ init_data: webApp.initData }),
+        });
+        const data = await response.json().catch(() => ({}));
+        if (!response.ok) {
+            status.textContent = data.error || data.detail || '{{ t.login_telegram_failed }}';
+            setTimeout(fallback, 1800);
+            return;
+        }
+        window.location.replace(data.redirect_to || '/configs');
+    } catch (_) {
+        status.textContent = '{{ t.login_telegram_failed }}';
+        setTimeout(fallback, 1800);
+    }
+})();
+</script>
+{% endblock body %}
Author	SHA1	Message	Date
Ultradesu	974b252637	Fixed group scope Build and Publish / Build and Publish Docker Image (push) Successful in 5m2s Details	2026-07-30 23:29:38 +01:00
Ultradesu	e890d1c147	Fixed group scope Build and Publish / Build and Publish Docker Image (push) Canceled after 2m2s Details	2026-07-30 23:27:34 +01:00
Ultradesu	9614ff8a60	Added client isolation settings. Fixed mobile UI Build and Publish / Build and Publish Docker Image (push) Successful in 6m6s Details	2026-07-30 23:03:18 +01:00
ab	e8873f61a5	Fixed mobile UI Build and Publish / Build and Publish Docker Image (push) Successful in 3m7s Details	2026-07-06 16:57:26 +03:00
ab	2dbbdb0252	Fixed TG login Build and Publish / Build and Publish Docker Image (push) Successful in 5m9s Details	2026-07-06 16:30:16 +03:00