j62
/
ctbrec
2
2
Fork 2
Code Issues 3 Pull Requests Packages Projects Releases 3 Wiki Activity

fix Stripchat login

This commit is contained in:
reusedname 2025-02-24 19:06:56 +05:00
parent 8489df70d1
commit 4e524396d2
1 changed files with 85 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

115
common/src/main/java/ctbrec/sites/stripchat/StripchatHttpClient.java
View File

@ -10,6 +10,9 @@ import okhttp3.*;
import org.json.JSONException; import org.json.JSONException;
import org.json.JSONObject; import org.json.JSONObject;
import java.time.Instant;
import java.util.Base64;
import java.nio.charset.StandardCharsets;
import java.io.IOException; import java.io.IOException;
import java.net.URLDecoder; import java.net.URLDecoder;
@ -21,9 +24,7 @@ public class StripchatHttpClient extends HttpClient {
public static final MediaType JSON = MediaType.parse("application/json; charset=utf-8"); public static final MediaType JSON = MediaType.parse("application/json; charset=utf-8");
private long userId; private long userId = 0;
@Getter
private String csrfToken; private String csrfToken;
@Getter @Getter
private String csrfTimestamp; private String csrfTimestamp;
@ -31,6 +32,7 @@ public class StripchatHttpClient extends HttpClient {
private String csrfNotifyTimestamp; private String csrfNotifyTimestamp;
@Getter @Getter
private String jwtToken; private String jwtToken;
private Instant jwtTokenExp;
public StripchatHttpClient(Config config) { public StripchatHttpClient(Config config) {
super("stripchat", config); super("stripchat", config);
@ -38,26 +40,21 @@ public class StripchatHttpClient extends HttpClient {
@Override @Override
public boolean login() throws IOException { public boolean login() throws IOException {
if (loggedIn) { // refresh token if needed
if (csrfToken == null) { getCsrfToken();
loadCsrfToken();
} // already logged in
if (loggedIn && isJwtTokenValid()) {
return true; return true;
} }
// persisted cookies might let us log in // persisted cookies might let us log in
if (checkLoginSuccess()) { if (checkLoginSuccess()) {
loggedIn = true; loggedIn = true;
log.debug("Logged in with cookies"); log.debug("Logged in with cookies");
if (csrfToken == null) {
loadCsrfToken();
}
return true; return true;
} }
if (csrfToken == null) {
loadCsrfToken();
}
String url = Stripchat.getBaseUri() + "/api/front/auth/login"; String url = Stripchat.getBaseUri() + "/api/front/auth/login";
JSONObject requestParams = new JSONObject(); JSONObject requestParams = new JSONObject();
@ -95,7 +92,7 @@ public class StripchatHttpClient extends HttpClient {
} }
private void loadCsrfToken() throws IOException { private void loadCsrfToken() throws IOException {
String url = Stripchat.getBaseUri() + "/api/front/v2/config/data?requestPath=%2F&timezoneOffset=0"; String url = Stripchat.getBaseUri() + "/api/front/v3/config/initial?requestPath=%2F&timezoneOffset=0";
Request request = new Request.Builder() Request request = new Request.Builder()
.url(url) .url(url)
.header(ACCEPT, MIMETYPE_APPLICATION_JSON) .header(ACCEPT, MIMETYPE_APPLICATION_JSON)
@ -107,10 +104,11 @@ public class StripchatHttpClient extends HttpClient {
try (Response response = execute(request)) { try (Response response = execute(request)) {
if (response.isSuccessful()) { if (response.isSuccessful()) {
JSONObject resp = new JSONObject(response.body().string()); JSONObject resp = new JSONObject(response.body().string());
JSONObject data = resp.getJSONObject("data"); JSONObject data = resp.getJSONObject("initial").getJSONObject("client");
csrfToken = data.optString("csrfToken"); csrfToken = data.optString("csrfToken");
csrfTimestamp = data.optString("csrfTimestamp"); csrfTimestamp = data.optString("csrfTimestamp");
csrfNotifyTimestamp = data.optString("csrfNotifyTimestamp"); csrfNotifyTimestamp = data.optString("csrfNotifyTimestamp");
log.debug("Stripchat token CSRF: {} [{}]", csrfToken, csrfNotifyTimestamp);
} else { } else {
throw new HttpException(response.code(), response.message()); throw new HttpException(response.code(), response.message());
} }
@ -118,7 +116,7 @@ public class StripchatHttpClient extends HttpClient {
} }
private void loadJwtToken() throws IOException { private void loadJwtToken() throws IOException {
String url = Stripchat.getBaseUri() + "/api/front/v2/config?requestPath=%2F&timezoneOffset=0"; String url = Stripchat.getBaseUri() + "/api/front/v3/config/dynamic";
Request request = new Request.Builder() Request request = new Request.Builder()
.url(url) .url(url)
.header(ACCEPT, MIMETYPE_APPLICATION_JSON) .header(ACCEPT, MIMETYPE_APPLICATION_JSON)
@ -130,8 +128,17 @@ public class StripchatHttpClient extends HttpClient {
try (Response response = execute(request)) { try (Response response = execute(request)) {
if (response.isSuccessful()) { if (response.isSuccessful()) {
JSONObject resp = new JSONObject(response.body().string()); JSONObject resp = new JSONObject(response.body().string());
JSONObject config = resp.getJSONObject("config"); JSONObject dynamic = resp.getJSONObject("dynamic");
jwtToken = config.optString("jwtToken"); jwtToken = dynamic.optString("jwtToken");
if (StringUtil.isNotBlank(jwtToken)) {
String[] parts = jwtToken.split("\\.");
if (parts.length > 1) {
String decString = new String(Base64.getDecoder().decode(parts[1]), StandardCharsets.UTF_8);
JSONObject body = new JSONObject(decString);
jwtTokenExp = Instant.ofEpochSecond(body.optLong("exp"));
}
}
log.debug("Stripchat token JWT: {} [{}]", jwtToken, jwtTokenExp);
} else { } else {
throw new HttpException(response.code(), response.message()); throw new HttpException(response.code(), response.message());
} }
@ -139,19 +146,15 @@ public class StripchatHttpClient extends HttpClient {
} }
/** /**
* check, if the login worked * check, if the login worked
* @throws IOException
*/ */
public boolean checkLoginSuccess() throws IOException { public boolean checkLoginSuccess() throws IOException {
try { getJwtToken();
loadJwtToken(); getCsrfToken();
} catch (Exception e) { return StringUtil.isNotBlank(jwtToken) && StringUtil.isNotBlank(csrfToken);
log.info("Login check returned unsuccessful: {}", e.getLocalizedMessage());
jwtToken = "";
return false;
}
return StringUtil.isNotBlank(jwtToken);
} }
public long getUserId() throws JSONException, IOException { public long getUserId() throws JSONException, IOException {
if (userId == 0) { if (userId == 0) {
String url = Stripchat.getBaseUri() + "/api/front/users/username/" + config.getSettings().stripchatUsername; String url = Stripchat.getBaseUri() + "/api/front/users/username/" + config.getSettings().stripchatUsername;
@ -176,7 +179,7 @@ public class StripchatHttpClient extends HttpClient {
return userId; return userId;
} }
public JSONObject getAmpl() { public JSONObject getAmpl() {
try { try {
Cookie cookie = getCookieJar().getCookie(HttpUrl.parse(Stripchat.getBaseUri()), "baseAmpl"); Cookie cookie = getCookieJar().getCookie(HttpUrl.parse(Stripchat.getBaseUri()), "baseAmpl");
String json = URLDecoder.decode(cookie.value(), UTF_8); String json = URLDecoder.decode(cookie.value(), UTF_8);
@ -186,4 +189,56 @@ public class StripchatHttpClient extends HttpClient {
return new JSONObject(); return new JSONObject();
} }
} }
public String getCsrfNotifyTimestamp() {
return csrfNotifyTimestamp;
}
public String getCsrfTimestamp() {
return csrfTimestamp;
}
public String getCsrfToken() {
try {
if (!isTokenValid()) {
loadCsrfToken();
}
} catch (Exception e) {
log.debug("Invalid CSRF Token {}: {}", csrfToken, e.getMessage());
csrfToken = "";
}
return csrfToken;
}
public String getJwtToken() {
try {
if (!isJwtTokenValid()) {
loadJwtToken();
}
} catch (Exception e) {
log.debug("Invalid JWT Token {}: {}", jwtToken, e.getMessage());
jwtToken = "";
}
return jwtToken;
}
private boolean isJwtTokenValid() {
if (StringUtil.isBlank(jwtToken) || jwtTokenExp == null) {
return false;
}
return jwtTokenExp.isAfter(Instant.now());
}
private boolean isTokenValid() {
if (StringUtil.isBlank(csrfToken) || StringUtil.isBlank(csrfTimestamp) || StringUtil.isBlank(csrfNotifyTimestamp)) {
return false;
}
try {
Instant notifyTime = Instant.parse(csrfNotifyTimestamp);
return notifyTime.isAfter(Instant.now());
} catch (Exception e) {
return false;
}
}
} }