From 261c81e39109e301d450feff9f67fdf0835aae02 Mon Sep 17 00:00:00 2001 From: Simon Date: Tue, 3 Jun 2025 12:29:41 +0000 Subject: [PATCH] cleanup and fixing --- burp/close.png | Bin 0 -> 2092 bytes src/api.rs | 111 +---------------------------------- src/providers/perverzija.rs | 25 ++------ supervisord/supervisord.conf | 2 - 4 files changed, 5 insertions(+), 133 deletions(-) create mode 100644 burp/close.png diff --git a/burp/close.png b/burp/close.png new file mode 100644 index 0000000000000000000000000000000000000000..5bf0fd5dd224acd209b417d24d4592705b5f0ec9 GIT binary patch literal 2092 zcmV+{2-Ek8P)O(QO_{DwG zH$e)vwW!z@xk_6UB(z@J3O=aR+BTq|ZM9N-C|sjRxrKnH-ix0YBR1KUY&QEbbLL~u z%sG7+``ie3S+e*1*r#P5&Yv0nGyggN|12PmEeUOiw|W7B&;pEwu+?i21VQ-PKnSt8 zqzi)3HUI#ai=5V;#BmkAi2#s9`6&oO`{105@>39m_Q4nvnx=8iqbNccGtON?bX^CGBM6ZM0OL%Q6v7ff2%sc! z@oC3Tvk*ccgt9Ex>vh+45kiSXVqsxHQ50R*qbMqu%Y+bJ*JW9*)oK8MdcB@Xr7*^d zqF9#o=FJ;bRTV`s3`0>ARaJu^pp@2XHCdLUD3WD4nMzSgIRs%CGKn`Djpjupv=h!b zZsz$fvVHl4eKOP?+fBN*P@B4jyeffNT=gyryJw2MH5kjIUvMkHA zEXTIrzI|&L2Bnk`l1`@;MVXzQ&1SQeN=4W8j*bq;ae8}u2_fZbWyOaBrBX>#RnEDl zX~kl(zrWw{+$KdNv=aa%+`O}2XiJ0;LP&3K@0~k$&Ye3qIy!pv=+R^{IXyl7;K755 ziHR*+wsduM`MzH+m$TXI;^HENP){UG%kn&rF-F6%TC07~_hA@@nr;x+HLX;&X8Qr9 zA?xoS_|IISqoc#LQia($(=@v>y|zsN7LN&qCBdy;fUwM1met+eU9DCxT(~eYGIHR+ z0SKY%xp-}kblTQvFJSa($X_}WV zUAl4OMi2x;LqmJ_?%lX?W2scqH0_tCPyh4&ea6_};NXvbcp#h2GR6oYDwbOvy08q0 z^0RF&awtYHDig-(Tj|4(o}Iv9U2X@XufT9b@d~ zU;g^5(`U|n_L*TAoC7ZQ>4hZ_<)`r8R8?KMa^=+2)a%!;2L=XIRi%{1H*1MR0wLr$ z4y9CAAjt* zuCD7500^Nl3{_S2JTGq4Fbo4iSSpoLsT3jP_3PKNEN3#AFbvmk`1W@;k9eMU|Ni~& z|KNM~?%m6N(5Csj%LRd~1V~*p< zvOF>}a_ZEnxFN%`tm*0L%a<>Eo|ntzZr!@o)z!6W)22)&^W|4xO-xJ-4Gl$6G(J9_ z&1Sc5-TLU!qnkHxrcx=>G$$t~U%h&@ZQHiE&*RSLch;|8UoMxQKYxDa%$YT7)4O|8bVks7H4K=u3o+R;>C+U=)GefxIb_fMQS zF*-V$&*xp&l^{5I^5opy+~VTmx^?T0A3ttcR-@6lef##cYuAd!;<|O~cI?=Z&*vFq zQ5605*S~rA@L|1P&*gG^_Uu`;YL#VKK@f1pS{=HuEHF@ATxj(ogs)%o9xB9RPnAj~ z2!fR#eMB5bQ54R(<2dnXfoYnGqCf~278ZJXdThsm5T;ToNs?^aHchioC}^4%k0ls} z;kquyI0%AjwW?`aCXfT}hHG%c7LpwykMe(_#|Z2LN0owf5A!q{caq2R0Q& zDHIBsOa>vu7{eGt2q~pu7)DW~C`x?i#W;^Q4FCYX?=!}-*{tVz@h@drj<+2oNrDh| zc6Ju#=HdZ^zW)AVp^#3e<0f9)7Vn)GmV$wbNNU3SP*s%>l1L<6*Nyi9YPA|d2y)5u zJkvA{!?0~TZrX4hCt-Fdib4pnZF^wFioo~l^*V%5*LB7irBwP~NgD*g{QP`RS2qAa zQIz@ldDAq*Fw``yUazYOz15)$%K`(Ha;epe5SpNA?;gS!S1J`v(~`;L?Cfl3XD0vv zLde4?kw_3iT-W8CClUz=p{lBG;JdEd)6-M0*Wfa-Or~5e>$;8*V)R`p8dtSZ6um1>Wzkb9 z{C@y&uqcw6APDUOLJ3P^q^=!_gDQMe0rAHxf*`aH&N&vBbU_f>24hT=pMoH?6YyV} WN2aNMS@N&|0000 Result { async fn videos_post( video_request: web::types::Json, ) -> Result { - // let mut format = Video_Format::new( - // "https://pervl2.xtremestream.xyz/player/xs1.php?data=794a51bb65913debd98f73111705738a" - // .to_string(), - // "1080p".to_string(), - // "m3u8".to_string(), - // ); - // format.add_http_header( - // "Referer".to_string(), - // "https://pervl2.xtremestream.xyz" - // .to_string(), - // ); let mut videos = Videos { pageInfo: PageInfo { hasNextPage: true, @@ -213,102 +201,5 @@ async fn videos_post( .get_videos(channel, sort, query, page.to_string(), perPage.to_string(), featured) .await; videos.items = video_items.clone(); - - /// #### MOCK RESPONSE - /// - // let mut format = Video_Format::new( - // "https://pervl2.xtremestream.xyz/player/xs1.php?data=794a51bb65913debd98f73111705738a" - // .to_string(), - // "1080p".to_string(), - // "m3u8".to_string(), - // ); - // format.add_http_header( - // "Referer".to_string(), - // "https://pervl2.xtremestream.xyz" - // .to_string(), - // ); - // let videos = Videos { - // pageInfo: PageInfo { - // hasNextPage: true, - // resultsPerPage: 10, - // }, - // items: vec![ - // Video_Item{ - // duration: 110, // 110, - // views: Some(14622653), // 14622653, - // rating: Some(0.0), // 0.0, - // id: "794a51bb65913debd98f73111705738a".to_string(), // "c85017ca87477168d648727753c4ded8a35f173e22ef93743e707b296becb299", - // title: "BrazzersExxtra – Give Me A D! The Best Of Cheerleaders".to_string(), // "20 Minutes of Adorable Kittens BEST Compilation", - // // url: "https://tube.perverzija.com/brazzersexxtra-give-me-a-d-the-best-of-cheerleaders/".to_string(), - // // url : "https://pervl2.xtremestream.xyz/player/xs1.php?data=794a51bb65913debd98f73111705738a".to_string(), // "https://www.youtube.com/watch?v=y0sF5xhGreA", - // url : "https://pervl2.xtremestream.xyz/player/index.php?data=794a51bb65913debd98f73111705738a".to_string(), - // channel: "perverzija".to_string(), // "youtube", - // thumb: "https://tube.perverzija.com/wp-content/uploads/2025/05/BrazzersExxtra-Give-Me-A-D-The-Best-Of-Cheerleaders.jpg".to_string(), // "https://i.ytimg.com/vi/y0sF5xhGreA/hqdefault.jpg", - // uploader: Some("Brazzers".to_string()), // "The Pet Collective", - // uploaderUrl: Some("https://brazzers.com".to_string()), // "https://www.youtube.com/@petcollective", - // verified: Some(false), // false, - // tags: Some(vec![]), // [], - // uploadedAt: Some(1741142954), // 1741142954 - // formats: Some(vec![format]), // Additional HTTP headers if needed - // embed: None, - - // } - // ], - // }; - - // println!("Video: {:?}", videos); - // #### - - Ok(web::HttpResponse::Ok().json(&videos)) -} - -// async fn videos_get(_req: HttpRequest) -> Result { -// let mut http_headers: HashMap = HashMap::new(); -// // http_headers.insert( -// // "Referer".to_string(), -// // "https://pervl2.xtremestream.xyz/player/index.php?data=794a51bb65913debd98f73111705738a" -// // .to_string(), -// // ); -// let mut format = Video_Format::new( -// "https://pervl2.xtremestream.xyz/player/xs1.php?data=794a51bb65913debd98f73111705738a" -// .to_string(), -// "1080p".to_string(), -// "m3u8".to_string(), -// ); -// format.add_http_header( -// "Referer".to_string(), -// "https://pervl2.xtremestream.xyz/player/index.php?data=794a51bb65913debd98f73111705738a" -// .to_string(), -// ); -// let videos = Videos { -// pageInfo: PageInfo { -// hasNextPage: true, -// resultsPerPage: 10, -// }, -// items: vec![ -// Video_Item{ -// duration: 110, // 110, -// views: Some(14622653), // 14622653, -// rating: Some(0.0), // 0.0, -// id: "794a51bb65913debd98f73111705738a".to_string(), // "c85017ca87477168d648727753c4ded8a35f173e22ef93743e707b296becb299", -// title: "BrazzersExxtra – Give Me A D! The Best Of Cheerleaders".to_string(), // "20 Minutes of Adorable Kittens BEST Compilation", -// // url: "https://tube.perverzija.com/brazzersexxtra-give-me-a-d-the-best-of-cheerleaders/".to_string(), -// // url : "https://pervl2.xtremestream.xyz/player/xs1.php?data=794a51bb65913debd98f73111705738a".to_string(), // "https://www.youtube.com/watch?v=y0sF5xhGreA", -// url : "https://pervl2.xtremestream.xyz/player/index.php?data=794a51bb65913debd98f73111705738a".to_string(), -// channel: "perverzija".to_string(), // "youtube", -// thumb: "https://tube.perverzija.com/wp-content/uploads/2025/05/BrazzersExxtra-Give-Me-A-D-The-Best-Of-Cheerleaders.jpg".to_string(), // "https://i.ytimg.com/vi/y0sF5xhGreA/hqdefault.jpg", -// uploader: Some("Brazzers".to_string()), // "The Pet Collective", -// uploaderUrl: Some("https://brazzers.com".to_string()), // "https://www.youtube.com/@petcollective", -// verified: Some(false), // false, -// tags: Some(vec![]), // [], -// uploadedAt: Some(1741142954), // 1741142954 -// formats: Some(vec![format]), // Additional HTTP headers if needed - -// } -// ], -// }; - -// println!("Video: {:?}", videos); -// Ok(web::HttpResponse::Ok().json(&videos)) -// } +} \ No newline at end of file diff --git a/src/providers/perverzija.rs b/src/providers/perverzija.rs index 5f6d1b1..f0cc8ad 100644 --- a/src/providers/perverzija.rs +++ b/src/providers/perverzija.rs @@ -47,11 +47,13 @@ impl PerverzijaProvider { let client = match env::var("BURP_URL").as_deref() { - Ok(burp_url) => reqwest::Client::builder() + Ok(burp_url) => { + println!("Using Burp Proxy: {}", burp_url); + reqwest::Client::builder() .user_agent("Mozilla/5.0 (iPhone; CPU iPhone OS 14_5 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) FxiOS/33.0 Mobile/15E148 Safari/605.1.15") .proxy(Proxy::https(burp_url).unwrap()) .danger_accept_invalid_certs(true) - .build()?, + .build()?}, Err(_) => reqwest::Client::builder() .user_agent("Mozilla/5.0 (iPhone; CPU iPhone OS 14_5 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) FxiOS/33.0 Mobile/15E148 Safari/605.1.15") .danger_accept_invalid_certs(true) @@ -158,16 +160,11 @@ impl PerverzijaProvider { println!("Skipping video segment with unexpected length: {}", vid.len()); continue; } - // for line in vid.clone() { - // println!("{}: {}\n\n", index, line); - // index += 1; - // } let mut title = vid[1].split(">").collect::>()[1] .split("<") .collect::>()[0] .to_string(); - println!("Title: {}", title); // html decode title = decode(title.as_bytes()).to_string().unwrap_or(title); let url = vid[1].split("iframe src="").collect::>()[1] @@ -210,9 +207,6 @@ impl PerverzijaProvider { .split("'") .collect::>()[0] .to_string(); - - // println!("Embed HTML: {}\n\n", embed_html); - // println!("Url: {}\n\n", url.clone()); let embed = Video_Embed::new(embed_html, url.clone()); let mut video_item = Video_Item::new( id, @@ -244,23 +238,15 @@ impl PerverzijaProvider { .split("video-item post") .collect::>()[1..] .to_vec(); - // println!("Raw Videos: {:?}", raw_videos); for video_segment in &raw_videos { let vid = video_segment.split("\n").collect::>(); if vid.len() > 20 { continue; } - // let mut index = 0; - // for line in vid.clone() { - // println!("{}: {}\n\n", index, line); - // index += 1; - // } - let mut title = vid[3].split("title='").collect::>()[1] .split("'") .collect::>()[0] .to_string(); - // html decode title = decode(title.as_bytes()).to_string().unwrap_or(title); let url = vid[4].split("iframe src="").collect::>()[1] .split(""") @@ -309,9 +295,6 @@ impl PerverzijaProvider { .split("'") .collect::>()[0] .to_string(); - - // println!("Embed HTML: {}\n\n", embed_html); - // println!("Url: {}\n\n", url.clone()); let embed = Video_Embed::new(embed_html, url.clone()); let mut video_item = Video_Item::new( id, diff --git a/supervisord/supervisord.conf b/supervisord/supervisord.conf index a36fa92..17c0ca8 100644 --- a/supervisord/supervisord.conf +++ b/supervisord/supervisord.conf @@ -13,8 +13,6 @@ directory=/app command=/dockerstartup/vnc_startup.sh --wait autostart=true autorestart=true -stdout_logfile=/dev/stdout -stderr_logfile=/dev/stderr [program:burpsuite] command=bash /app/supervisord/burpsuite.sh