Phones stay joined: Lax cookie and a kept token to put it back (0.110.2)
Paul, 8 November 2026: the phone kept asking to join again on the same Wi-Fi. The TV never forgot it (two joins today); the phone arrived without its cookie. SameSite=Strict cookies are withheld when the page is opened from another app (a home-screen shortcut, the camera), so the cookie is now Lax; changes still need X-Orbit and an address as Host. The phone also keeps the token (handed over in the #fragment, never sent to the network again) and the join page quietly puts the cookie back via POST /rejoin; wrong tokens count as strikes. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -9,8 +9,8 @@ android {
|
||||
applicationId = "tv.orbit.classic"
|
||||
minSdk = 26
|
||||
targetSdk = 36
|
||||
versionCode = 276
|
||||
versionName = "0.110.1-features"
|
||||
versionCode = 277
|
||||
versionName = "0.110.2-phone-remembered"
|
||||
}
|
||||
buildFeatures { compose = true }
|
||||
// The finished build for the TVs (Paul, 6 November 2026: the test build stuttered on the box). Not debuggable, so
|
||||
|
||||
@@ -14,6 +14,9 @@ button.wide{width:100%;padding:15px;font-size:18px}button:disabled{opacity:.5}in
|
||||
.bar div{max-width:480px;margin:0 auto}.note{color:var(--gold);margin:10px 0}.chosen li{margin:4px 0}.ok{color:var(--mint);font-size:13px}
|
||||
</style></head><body><main id="app"></main><div class="bar"><div id="bar"></div></div>
|
||||
<script>
|
||||
// Joined (8 November 2026): keep the token the TV handed over in #keep=, so the cookie can be put back if the phone loses it.
|
||||
try { const k = location.hash.match(/keep=([0-9a-f]{64})/); if (k) { localStorage.setItem('orbit.phone', k[1]); sessionStorage.removeItem('orbit.rejoin'); history.replaceState(null, '', location.pathname); } else sessionStorage.removeItem('orbit.rejoin'); } catch (e) {}
|
||||
|
||||
const $ = s => document.querySelector(s); const app = $('#app'), bar = $('#bar');
|
||||
const esc = s => String(s ?? '').replace(/[&<>"]/g, c => ({'&':'&','<':'<','>':'>','"':'"'}[c]));
|
||||
const api = async (path, body) => { const r = await fetch(path, body ? {method:'POST', headers:{'Content-Type':'application/json','X-Orbit':'1'}, body:JSON.stringify(body)} : {}); const j = await r.json(); if (!r.ok) throw new Error(j.error || 'Something went wrong'); return j; };
|
||||
|
||||
@@ -91,6 +91,9 @@ body.typing .kbar,body.typing nav{display:none}
|
||||
<nav><div id="tabs"></div></nav>
|
||||
<div class="toast" id="toast"></div>
|
||||
<script>
|
||||
// Joined (8 November 2026): keep the token the TV handed over in #keep=, so the cookie can be put back if the phone loses it.
|
||||
try { const k = location.hash.match(/keep=([0-9a-f]{64})/); if (k) { localStorage.setItem('orbit.phone', k[1]); sessionStorage.removeItem('orbit.rejoin'); history.replaceState(null, '', location.pathname); } else sessionStorage.removeItem('orbit.rejoin'); } catch (e) {}
|
||||
|
||||
const $ = s => document.querySelector(s);
|
||||
const esc = s => String(s ?? '').replace(/[&<>"']/g, c => ({'&':'&','<':'<','>':'>','"':'"',"'":'''}[c]));
|
||||
const api = async (path, body) => {
|
||||
|
||||
@@ -62,9 +62,9 @@ internal class HttpsEmbyTransport(internal val deviceId: String = UUID.randomUUI
|
||||
}
|
||||
/** The sign-in headers for this kind of server. */
|
||||
internal fun authHeaders(token: String?): Map<String, String> = when (kind) {
|
||||
ServerKind.Emby -> mapOf("X-Emby-Authorization" to "Emby Client=\"Orbit TV\", Device=\"Orbit TV\", DeviceId=\"$deviceId\", Version=\"0.110.1\"") +
|
||||
ServerKind.Emby -> mapOf("X-Emby-Authorization" to "Emby Client=\"Orbit TV\", Device=\"Orbit TV\", DeviceId=\"$deviceId\", Version=\"0.110.2\"") +
|
||||
(token?.let { mapOf("X-Emby-Token" to it) } ?: emptyMap())
|
||||
ServerKind.Jellyfin -> mapOf("Authorization" to "MediaBrowser Client=\"Orbit TV\", Device=\"Orbit TV\", DeviceId=\"$deviceId\", Version=\"0.110.1\"" +
|
||||
ServerKind.Jellyfin -> mapOf("Authorization" to "MediaBrowser Client=\"Orbit TV\", Device=\"Orbit TV\", DeviceId=\"$deviceId\", Version=\"0.110.2\"" +
|
||||
(token?.let { ", Token=\"$it\"" } ?: ""))
|
||||
}
|
||||
/** One picture from the provider, or nothing. Same fixed origin and no redirects, and failures are never shown or logged. */
|
||||
|
||||
@@ -184,6 +184,23 @@ internal object PhoneLink {
|
||||
return prefs().get(id)?.let { id }
|
||||
}
|
||||
|
||||
/**
|
||||
* The phone's cookie. Lax rather than Strict (8 November 2026): Strict is withheld when the page is opened from another
|
||||
* app, such as a home-screen shortcut or the camera, so a joined phone looked new. Changes still need the X-Orbit header
|
||||
* and an address as Host, so another site can't act through it.
|
||||
*/
|
||||
private fun cookieHeader(token: String) = "Set-Cookie: $COOKIE=$token; HttpOnly; SameSite=Lax; Path=/; Max-Age=31536000"
|
||||
|
||||
/** A joined phone putting its cookie back from the token it kept: only a token this TV issued, and wrong ones count as strikes. */
|
||||
private fun rejoin(r: Request, out: OutputStream, who: String) {
|
||||
if (refused(who)) return json(out, 429, JSONObject().put("error", "Too many tries."))
|
||||
val token = r.body.trim()
|
||||
val known = token.length == 64 && token.all { it in '0'..'9' || it in 'a'..'f' } && prefs().get(hash(token)) != null
|
||||
if (!known) { strike(who); note("rejoin_refused"); return json(out, 403, JSONObject().put("joined", false)) }
|
||||
note("rejoined")
|
||||
respond(out, 200, "application/json; charset=utf-8", JSONObject().put("joined", true).toString().toByteArray(), listOf(cookieHeader(token)))
|
||||
}
|
||||
|
||||
/** The Host a request names: an address, never a name a page elsewhere could point at this TV. */
|
||||
private fun hostIsAnAddress(host: String?): Boolean {
|
||||
val name = host?.trim()?.let { if (it.startsWith("[")) it.substringBefore(']') + "]" else it.substringBefore(':') } ?: return false
|
||||
@@ -238,6 +255,7 @@ internal object PhoneLink {
|
||||
val phone = phoneOf(r)
|
||||
when {
|
||||
r.path == "/join" -> join(r, out, socket.inetAddress.hostAddress.orEmpty())
|
||||
r.path == "/rejoin" && r.method == "POST" && r.headers["x-orbit"] == "1" -> rejoin(r, out, socket.inetAddress.hostAddress.orEmpty())
|
||||
phone == null -> page(out, PhonePages.join(null))
|
||||
r.path == "/" -> page(out, PhonePages.companion())
|
||||
r.path == "/create" -> page(out, PhonePages.app())
|
||||
@@ -284,7 +302,9 @@ internal object PhoneLink {
|
||||
val name = phoneName(r.headers["user-agent"].orEmpty())
|
||||
prefs().put(hash(token), "$name|${System.currentTimeMillis()}")
|
||||
pairing = null; loadPhones(); active = name; strikes.remove(who); note("joined")
|
||||
respond(out, 302, "text/plain", ByteArray(0), listOf("Location: /", "Set-Cookie: $COOKIE=$token; HttpOnly; SameSite=Strict; Path=/; Max-Age=31536000"))
|
||||
// The phone also keeps the token itself (8 November 2026: phones kept being asked to join again), handed over in the
|
||||
// address's #fragment, which never leaves the phone, so a lost or withheld cookie can be put back without the code.
|
||||
respond(out, 302, "text/plain", ByteArray(0), listOf("Location: /#keep=$token", cookieHeader(token)))
|
||||
}
|
||||
|
||||
private fun phoneName(agent: String) = when {
|
||||
|
||||
@@ -8,9 +8,12 @@ body{margin:0;background:#071632;color:#fff;font:16px/1.4 system-ui,sans-serif;d
|
||||
main{width:min(92vw,380px)}h1{font-size:30px;margin:0 0 6px}p{color:#b7cbe8}input{width:100%;box-sizing:border-box;font-size:28px;letter-spacing:8px;text-align:center;
|
||||
padding:12px;border-radius:12px;border:2px solid #194c91;background:#12356b;color:#fff;margin:12px 0}button{width:100%;padding:14px;border:0;border-radius:12px;
|
||||
background:#ffde59;color:#071632;font-size:18px;font-weight:700}.note{color:#ffde59}</style>"""
|
||||
/** A phone that joined before, but arrived without its cookie, puts it back from the token it kept, once per visit. */
|
||||
private const val REJOIN = """<script>(function(){try{var t=localStorage.getItem('orbit.phone');if(!t||sessionStorage.getItem('orbit.rejoin'))return;sessionStorage.setItem('orbit.rejoin','1');
|
||||
fetch('/rejoin',{method:'POST',headers:{'X-Orbit':'1','Content-Type':'text/plain'},body:t}).then(function(r){if(r.ok)location.reload();else localStorage.removeItem('orbit.phone');});}catch(e){}})();</script>"""
|
||||
fun join(note: String?) = """<!doctype html><html><head><title>Orbit</title>$STYLE</head><body><main><h1>Orbit</h1>
|
||||
<p>Enter the code shown on the TV in Settings › Rooms and phones › Connect a phone.</p>${note?.let { "<p class='note'>${esc(it)}</p>" }.orEmpty()}
|
||||
<form method="post" action="/join"><input name="code" inputmode="numeric" maxlength="4" autocomplete="one-time-code" autofocus><button>Join</button></form></main></body></html>"""
|
||||
<form method="post" action="/join"><input name="code" inputmode="numeric" maxlength="4" autocomplete="one-time-code" autofocus><button>Join</button></form></main>$REJOIN</body></html>"""
|
||||
fun pin(k: String?, code: String?, wrong: Boolean) = """<!doctype html><html><head><title>Orbit</title>$STYLE</head><body><main><h1>Adult PIN</h1>
|
||||
<p>The code worked. Joining a phone is for adults, so now enter your <b>Adult PIN</b>: the four digits that unlock After Dark on the TV.</p>
|
||||
<p>It isn't the code on the TV screen.</p>${if (wrong) "<p class='note'>That PIN didn't match. It's the After Dark PIN, not the TV's code.</p>" else ""}
|
||||
|
||||
@@ -39,7 +39,7 @@ internal class SecureMediaDataSource(private val session: EmbySampleSession) : B
|
||||
next.instanceFollowRedirects = false
|
||||
next.connectTimeout = 10_000
|
||||
next.readTimeout = 20_000
|
||||
next.setRequestProperty("User-Agent", "OrbitTV/0.110.1")
|
||||
next.setRequestProperty("User-Agent", "OrbitTV/0.110.2")
|
||||
next.setRequestProperty("Accept-Encoding", "identity")
|
||||
session.mediaHeaders(address).forEach { (key, value) -> next.setRequestProperty(key, value) }
|
||||
if (dataSpec.position != 0L || dataSpec.length != C.LENGTH_UNSET.toLong()) {
|
||||
|
||||
@@ -70,6 +70,13 @@ class PhoneLinkTest {
|
||||
assertEquals(302, joined.status); val cookie = joined.cookie!!
|
||||
assertEquals(1, phones.size); assertNull(PhoneLink.pairing)
|
||||
assertTrue(call("/join", "POST", "code=${p.code}", form = true).body.contains("run out")) // once only
|
||||
// A phone that lost its cookie (8 November 2026) puts it back from the token it kept; nothing else gets in that way.
|
||||
val token = cookie.substringAfter('=')
|
||||
val back = call("/rejoin", "POST", token, cookie = null)
|
||||
assertEquals(200, back.status); assertEquals(cookie, back.cookie)
|
||||
assertEquals(403, call("/rejoin", "POST", "f".repeat(64)).status)
|
||||
assertEquals(403, call("/rejoin", "POST", "not a token").status)
|
||||
assertFalse(call("/rejoin", "POST", token, orbit = false).body.contains("joined")) // no X-Orbit: just the join page
|
||||
// The API, joined.
|
||||
assertEquals(0, JSONObject(call("/api/channels", cookie = cookie).body).getJSONArray("channels").length())
|
||||
assertEquals("The X-Files", JSONArray(call("/api/suggest?d=90s%20sci-fi", cookie = cookie).body).getJSONObject(0).getString("title"))
|
||||
|
||||
Reference in New Issue
Block a user