logiguard fork: GPUI xdg-activation keyboard-focus serial fix
Some checks failed
Update All Top Ranking Issues / update_top_ranking_issues (push) Has been cancelled
Triage Project Sync (#84) / Sync triage project (push) Has been cancelled
release_nightly / notify_on_failure (push) Has been cancelled
release_nightly / check_style (push) Has been cancelled
release_nightly / run_tests_windows (push) Has been cancelled
release_nightly / clippy_windows (push) Has been cancelled
release_nightly / bundle_linux_aarch64 (push) Has been cancelled
release_nightly / bundle_linux_x86_64 (push) Has been cancelled
release_nightly / bundle_mac_aarch64 (push) Has been cancelled
release_nightly / bundle_mac_x86_64 (push) Has been cancelled
release_nightly / bundle_windows_aarch64 (push) Has been cancelled
release_nightly / bundle_windows_x86_64 (push) Has been cancelled
release_nightly / build_nix_linux_x86_64 (push) Has been cancelled
release_nightly / build_nix_mac_aarch64 (push) Has been cancelled
release_nightly / update_nightly_tag (push) Has been cancelled
Hotfix Review Monitor / check-hotfix-reviews (push) Has been cancelled
Stale PR Review Reminder / check-stale-prs (push) Has been cancelled
Update Weekly Top Ranking Issues / update_top_ranking_issues (push) Has been cancelled
Bump collab-staging Tag / update-collab-staging-tag (push) Has been cancelled
compliance_check / scheduled_compliance_check (push) Has been cancelled
Some checks failed
Update All Top Ranking Issues / update_top_ranking_issues (push) Has been cancelled
Triage Project Sync (#84) / Sync triage project (push) Has been cancelled
release_nightly / notify_on_failure (push) Has been cancelled
release_nightly / check_style (push) Has been cancelled
release_nightly / run_tests_windows (push) Has been cancelled
release_nightly / clippy_windows (push) Has been cancelled
release_nightly / bundle_linux_aarch64 (push) Has been cancelled
release_nightly / bundle_linux_x86_64 (push) Has been cancelled
release_nightly / bundle_mac_aarch64 (push) Has been cancelled
release_nightly / bundle_mac_x86_64 (push) Has been cancelled
release_nightly / bundle_windows_aarch64 (push) Has been cancelled
release_nightly / bundle_windows_x86_64 (push) Has been cancelled
release_nightly / build_nix_linux_x86_64 (push) Has been cancelled
release_nightly / build_nix_mac_aarch64 (push) Has been cancelled
release_nightly / update_nightly_tag (push) Has been cancelled
Hotfix Review Monitor / check-hotfix-reviews (push) Has been cancelled
Stale PR Review Reminder / check-stale-prs (push) Has been cancelled
Update Weekly Top Ranking Issues / update_top_ranking_issues (push) Has been cancelled
Bump collab-staging Tag / update-collab-staging-tag (push) Has been cancelled
compliance_check / scheduled_compliance_check (push) Has been cancelled
Single-commit orphan branch: full zed-industries/zed @ 8c74db0 source tree with a 3-file patch applied (no upstream history). Patch (crates/gpui_linux/src/linux/wayland/): - serial.rs: add SerialKind::KeyboardEnter - client.rs: store wl_keyboard.enter serial; add latest_serial_of() - window.rs: activate() uses keyboard-enter serial (Mutter focus gate) Mutter honors window activation only when the token carries the keyboard- focus serial from wl_keyboard.enter; GPUI used a stale mouse-press serial. See docs/tray-window-focus-wayland.md in logiguard. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
110
crates/livekit_api/src/token.rs
Normal file
110
crates/livekit_api/src/token.rs
Normal file
@@ -0,0 +1,110 @@
|
||||
use anyhow::Result;
|
||||
use jsonwebtoken::{DecodingKey, EncodingKey, Header, Validation};
|
||||
use serde::{Deserialize, Serialize};
|
||||
use std::{
|
||||
borrow::Cow,
|
||||
ops::Add,
|
||||
time::{Duration, SystemTime, UNIX_EPOCH},
|
||||
};
|
||||
|
||||
const DEFAULT_TTL: Duration = Duration::from_secs(6 * 60 * 60); // 6 hours
|
||||
|
||||
#[derive(Default, Serialize, Deserialize)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
pub struct ClaimGrants<'a> {
|
||||
pub iss: Cow<'a, str>,
|
||||
pub sub: Option<Cow<'a, str>>,
|
||||
pub iat: u64,
|
||||
pub exp: u64,
|
||||
pub nbf: u64,
|
||||
pub jwtid: Option<Cow<'a, str>>,
|
||||
pub video: VideoGrant<'a>,
|
||||
}
|
||||
|
||||
#[derive(Default, Serialize, Deserialize)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
pub struct VideoGrant<'a> {
|
||||
pub room_create: Option<bool>,
|
||||
pub room_join: Option<bool>,
|
||||
pub room_list: Option<bool>,
|
||||
pub room_record: Option<bool>,
|
||||
pub room_admin: Option<bool>,
|
||||
pub room: Option<Cow<'a, str>>,
|
||||
pub can_publish: Option<bool>,
|
||||
pub can_subscribe: Option<bool>,
|
||||
pub can_publish_data: Option<bool>,
|
||||
pub hidden: Option<bool>,
|
||||
pub recorder: Option<bool>,
|
||||
}
|
||||
|
||||
impl<'a> VideoGrant<'a> {
|
||||
pub fn to_admin(room: &'a str) -> Self {
|
||||
Self {
|
||||
room_admin: Some(true),
|
||||
room: Some(Cow::Borrowed(room)),
|
||||
..Default::default()
|
||||
}
|
||||
}
|
||||
|
||||
pub fn to_join(room: &'a str) -> Self {
|
||||
Self {
|
||||
room: Some(Cow::Borrowed(room)),
|
||||
room_join: Some(true),
|
||||
can_publish: Some(true),
|
||||
can_subscribe: Some(true),
|
||||
..Default::default()
|
||||
}
|
||||
}
|
||||
|
||||
pub fn for_guest(room: &'a str) -> Self {
|
||||
Self {
|
||||
room: Some(Cow::Borrowed(room)),
|
||||
room_join: Some(true),
|
||||
can_publish: Some(false),
|
||||
can_subscribe: Some(true),
|
||||
..Default::default()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pub fn create(
|
||||
api_key: &str,
|
||||
secret_key: &str,
|
||||
identity: Option<&str>,
|
||||
video_grant: VideoGrant,
|
||||
) -> Result<String> {
|
||||
if video_grant.room_join.is_some() && identity.is_none() {
|
||||
anyhow::bail!("identity is required for room_join grant, but it is none");
|
||||
}
|
||||
|
||||
let now = SystemTime::now();
|
||||
|
||||
let claims = ClaimGrants {
|
||||
iss: Cow::Borrowed(api_key),
|
||||
sub: identity.map(Cow::Borrowed),
|
||||
iat: now.duration_since(UNIX_EPOCH).unwrap().as_secs(),
|
||||
exp: now
|
||||
.add(DEFAULT_TTL)
|
||||
.duration_since(UNIX_EPOCH)
|
||||
.unwrap()
|
||||
.as_secs(),
|
||||
nbf: 0,
|
||||
jwtid: identity.map(Cow::Borrowed),
|
||||
video: video_grant,
|
||||
};
|
||||
Ok(jsonwebtoken::encode(
|
||||
&Header::default(),
|
||||
&claims,
|
||||
&EncodingKey::from_secret(secret_key.as_ref()),
|
||||
)?)
|
||||
}
|
||||
|
||||
pub fn validate<'a>(token: &'a str, secret_key: &str) -> Result<ClaimGrants<'a>> {
|
||||
let token = jsonwebtoken::decode(
|
||||
token,
|
||||
&DecodingKey::from_secret(secret_key.as_ref()),
|
||||
&Validation::default(),
|
||||
)?;
|
||||
|
||||
Ok(token.claims)
|
||||
}
|
||||
Reference in New Issue
Block a user