davebluke
/
ctbrec
forked from j62/ctbrec
1
0
Fork 0
Code Pull Requests Activity

Fix Streamate 

Streamate introduced a CSRF token, which has to be sent in the HTTP
header.
This commit is contained in:
0xboobface 2020-01-26 18:33:13 +01:00
parent d6574a63b9
commit 18669a9c43
3 changed files with 60 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
client/src/main/java/ctbrec/ui/sites/streamate/StreamateUpdateService.java
View File

@ -1,11 +1,8 @@
package ctbrec.ui.sites.streamate;
import static ctbrec.io.HttpConstants.*;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.xpath.XPathExpressionException;
@ -16,10 +13,10 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.xml.sax.SAXException;
import ctbrec.Config;
import ctbrec.Model;
import ctbrec.io.HttpException;
import ctbrec.sites.streamate.Streamate;
import ctbrec.sites.streamate.StreamateHttpClient;
import ctbrec.sites.streamate.StreamateModel;
import ctbrec.ui.tabs.PaginatedScheduledService;
import javafx.concurrent.Task;
@ -32,11 +29,13 @@ public class StreamateUpdateService extends PaginatedScheduledService {
private static final int MODELS_PER_PAGE = 48;
private Streamate streamate;
private StreamateHttpClient httpClient;
private String url;
public StreamateUpdateService(Streamate streamate, String url) {
this.streamate = streamate;
this.url = url;
this.httpClient = (StreamateHttpClient) streamate.getHttpClient();
}
@Override
@ -47,14 +46,8 @@ public class StreamateUpdateService extends PaginatedScheduledService {
int from = (page - 1) * MODELS_PER_PAGE;
String pageUrl = url + "&from=" + from + "&size=" + MODELS_PER_PAGE;
LOG.debug("Fetching page {}", pageUrl);
Request request = new Request.Builder()
.url(pageUrl)
.addHeader(USER_AGENT, Config.getInstance().getSettings().httpUserAgent)
.addHeader(ACCEPT, MIMETYPE_APPLICATION_JSON)
.addHeader(ACCEPT_LANGUAGE, Locale.ENGLISH.getLanguage())
.addHeader(REFERER, streamate.getBaseUrl())
.build();
try(Response response = streamate.getHttpClient().execute(request)) {
Request request = httpClient.newRequestBuilder().url(pageUrl).build();
try (Response response = httpClient.execute(request)) {
if (response.isSuccessful()) {
List<Model> models = new ArrayList<>();
String content = response.body().string();

10
common/src/main/java/ctbrec/sites/streamate/Streamate.java
View File

@ -1,13 +1,10 @@
package ctbrec.sites.streamate;
import static ctbrec.io.HttpConstants.*;
import java.io.IOException;
import java.net.URLEncoder;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Locale;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@ -145,12 +142,7 @@ public class Streamate extends AbstractSite {
@Override
public List<Model> search(String q) throws IOException, InterruptedException {
String url = BASE_URL + "/api/search/autocomplete?exact=false&skin_search_kids=0&results_per_page=10&query=" + URLEncoder.encode(q, "utf-8");
Request req = new Request.Builder().url(url)
.addHeader(USER_AGENT, Config.getInstance().getSettings().httpUserAgent)
.addHeader(ACCEPT, MIMETYPE_APPLICATION_JSON)
.addHeader(ACCEPT_LANGUAGE, Locale.ENGLISH.getLanguage())
.addHeader(REFERER, Streamate.BASE_URL)
.addHeader(X_REQUESTED_WITH, XML_HTTP_REQUEST).build();
Request req = httpClient.newRequestBuilder().url(url).build();
try (Response response = getHttpClient().execute(req)) {
if (response.isSuccessful()) {
String body = response.body().string();

61
common/src/main/java/ctbrec/sites/streamate/StreamateHttpClient.java
View File

@ -6,6 +6,8 @@ import java.io.IOException;
import java.util.Collections;
import java.util.Locale;
import java.util.NoSuchElementException;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.json.JSONObject;
import org.slf4j.Logger;
@ -13,6 +15,8 @@ import org.slf4j.LoggerFactory;
import ctbrec.Config;
import ctbrec.io.HttpClient;
import ctbrec.io.HttpConstants;
import ctbrec.io.HttpException;
import okhttp3.Cookie;
import okhttp3.HttpUrl;
import okhttp3.MediaType;
@ -29,6 +33,7 @@ public class StreamateHttpClient extends HttpClient {
private Long userId;
private String saKey = "";
private String userNickname = "";
private String xsrfToken = null;
public StreamateHttpClient() {
super("streamate");
@ -48,6 +53,29 @@ public class StreamateHttpClient extends HttpClient {
} catch (NoSuchElementException e) {
// ignore
}
loadXsrfToken();
}
private void loadXsrfToken() {
// do a first request to get cookies and stuff
Request req = new Request.Builder() //
.url(Streamate.BASE_URL) //
.header(HttpConstants.USER_AGENT, Config.getInstance().getSettings().httpUserAgent) //
.build();
try (Response resp = execute(req)) {
if (resp.code() == 200) {
LOG.info("Initial request was fine, Extracting XSRF token");
Matcher m = Pattern.compile("\"xsrfToken\":\"(.*?)\"").matcher(resp.body().string());
if (m.find()) {
xsrfToken = m.group(1);
}
} else {
throw new HttpException(resp.code(), resp.message());
}
} catch (IOException e) {
LOG.error("Initial request failed", e);
}
}
@Override
@ -74,13 +102,8 @@ public class StreamateHttpClient extends HttpClient {
loginRequest.put("referrerId", 0);
loginRequest.put("siteId", 1);
RequestBody body = RequestBody.create(MediaType.parse("application/json"), loginRequest.toString());
Request login = new Request.Builder()
Request login = newRequestBuilder()
.url(Streamate.BASE_URL + "/api/member/login")
.addHeader(USER_AGENT, Config.getInstance().getSettings().httpUserAgent)
.addHeader(ACCEPT, MIMETYPE_APPLICATION_JSON)
.addHeader(ACCEPT_LANGUAGE, Locale.ENGLISH.getLanguage())
.addHeader(REFERER, Streamate.BASE_URL)
.addHeader(X_REQUESTED_WITH, XML_HTTP_REQUEST)
.post(body)
.build();
try (Response response = client.newCall(login).execute()) {
@ -101,20 +124,24 @@ public class StreamateHttpClient extends HttpClient {
return loggedIn;
}
public Request.Builder newRequestBuilder() {
return new Request.Builder() // @formatter:off
.header(USER_AGENT, Config.getInstance().getSettings().httpUserAgent)
.header(ACCEPT, MIMETYPE_APPLICATION_JSON)
.header(ACCEPT_LANGUAGE, Locale.ENGLISH.getLanguage())
.header(REFERER, Streamate.BASE_URL)
.header(X_REQUESTED_WITH, XML_HTTP_REQUEST)
.header("X-XSRF-TOKEN", getXsrfToken()); // @formatter:on
}
/**
* Check, if the login worked by loading the favorites
*/
public boolean checkLoginSuccess() {
String url = Streamate.BASE_URL + "/api/search/v1/favorites?host=streamate.com&domain=streamate.com";
url = url + "&page_number=1&results_per_page=48&sakey=" + saKey + "&userid=" + userId;
Request request = new Request.Builder()
.url(url)
.addHeader(USER_AGENT, Config.getInstance().getSettings().httpUserAgent)
.addHeader(ACCEPT, MIMETYPE_APPLICATION_JSON)
.addHeader(ACCEPT_LANGUAGE, Locale.ENGLISH.getLanguage())
.addHeader(REFERER, Streamate.BASE_URL)
.build();
try(Response response = execute(request)) {
Request request = newRequestBuilder().url(url).build();
try (Response response = execute(request)) {
if (response.isSuccessful()) {
String content = response.body().string();
JSONObject json = new JSONObject(content);
@ -122,7 +149,7 @@ public class StreamateHttpClient extends HttpClient {
} else {
return false;
}
} catch(Exception e) {
} catch (Exception e) {
return false;
}
}
@ -141,4 +168,8 @@ public class StreamateHttpClient extends HttpClient {
public String getUserNickname() {
return userNickname;
}
public String getXsrfToken() {
return xsrfToken;
}
}