idanoo/autobrr
1
0
Fork 0
mirror of https://github.com/idanoo/autobrr synced 2025-07-23 00:39:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat(indexers): add cookie support (#205)

Browse source
This commit is contained in:
Ludvig Lundgren 2022-03-26 16:12:30 +01:00 • committed by GitHub
parent 8faf7ed410
commit 4a9d8b54be
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 36 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

10
internal/action/run.go
View file

@ -55,7 +55,7 @@ func (s *service) runAction(action domain.Action, release domain.Release) error
case domain.ActionTypeExec:
if release.TorrentTmpFile == "" {
if err := release.DownloadTorrentFile(nil); err != nil {
if err := release.DownloadTorrentFile(); err != nil {
log.Error().Stack().Err(err)
return err
}
@ -65,7 +65,7 @@ func (s *service) runAction(action domain.Action, release domain.Release) error
case domain.ActionTypeWatchFolder:
if release.TorrentTmpFile == "" {
if err := release.DownloadTorrentFile(nil); err != nil {
if err := release.DownloadTorrentFile(); err != nil {
log.Error().Stack().Err(err)
return err
}
@ -75,7 +75,7 @@ func (s *service) runAction(action domain.Action, release domain.Release) error
case domain.ActionTypeWebhook:
if release.TorrentTmpFile == "" {
if err := release.DownloadTorrentFile(nil); err != nil {
if err := release.DownloadTorrentFile(); err != nil {
log.Error().Stack().Err(err)
return err
}
@ -95,7 +95,7 @@ func (s *service) runAction(action domain.Action, release domain.Release) error
}
if release.TorrentTmpFile == "" {
if err := release.DownloadTorrentFile(nil); err != nil {
if err := release.DownloadTorrentFile(); err != nil {
log.Error().Stack().Err(err)
return err
}
@ -119,7 +119,7 @@ func (s *service) runAction(action domain.Action, release domain.Release) error
}
if release.TorrentTmpFile == "" {
if err := release.DownloadTorrentFile(nil); err != nil {
if err := release.DownloadTorrentFile(); err != nil {
log.Error().Stack().Err(err)
return err
}

34
internal/domain/release.go
View file

@ -5,9 +5,11 @@ import (
"context"
"crypto/tls"
"fmt"
"golang.org/x/net/publicsuffix"
"html"
"io"
"net/http"
"net/http/cookiejar"
"net/url"
"os"
"regexp"
@ -88,6 +90,7 @@ type Release struct {
FreeleechPercent int `json:"freeleech_percent"`
Uploader string `json:"uploader"`
PreTime string `json:"pre_time"`
RawCookie string `json:"-"`
AdditionalSizeCheckRequired bool `json:"-"`
FilterID int `json:"-"`
Filter *Filter `json:"-"`
@ -605,12 +608,15 @@ func (r *Release) ParseTorrentUrl(match string, vars map[string]string, extraVar
r.TorrentURL = urlBytes.String()
// TODO handle cookies
// handle cookies
if v, ok := extraVars["cookie"]; ok {
r.RawCookie = v
}
return nil
}
func (r *Release) DownloadTorrentFile(opts map[string]string) error {
func (r *Release) DownloadTorrentFile() error {
if r.TorrentURL == "" {
return errors.New("download_file: url can't be empty")
} else if r.TorrentTmpFile != "" {
@ -618,12 +624,32 @@ func (r *Release) DownloadTorrentFile(opts map[string]string) error {
return nil
}
jar, err := cookiejar.New(&cookiejar.Options{PublicSuffixList: publicsuffix.List})
if err != nil {
return err
}
customTransport := http.DefaultTransport.(*http.Transport).Clone()
customTransport.TLSClientConfig = &tls.Config{InsecureSkipVerify: true}
client := &http.Client{Transport: customTransport}
client := &http.Client{
Transport: customTransport,
Jar: jar,
}
req, err := http.NewRequest("GET", r.TorrentURL, nil)
if err != nil {
log.Error().Stack().Err(err).Msg("error downloading file")
return err
}
if r.RawCookie != "" {
// set the cookie on the header instead of req.AddCookie
// since we have a raw cookie like "uid=10; pass=000"
req.Header.Set("Cookie", r.RawCookie)
}
// Get the data
resp, err := client.Get(r.TorrentURL)
resp, err := client.Do(req)
if err != nil {
log.Error().Stack().Err(err).Msg("error downloading file")
return err

2
internal/filter/service.go
View file

@ -293,7 +293,7 @@ func (s *service) FindAndCheckFilters(release *domain.Release) (bool, *domain.Fi
log.Trace().Msgf("filter-service.find_and_check_filters: (%v) additional size check required: preparing to download metafile", f.Name)
// if indexer doesn't have api, download torrent and add to tmpPath
err = release.DownloadTorrentFile(nil)
err = release.DownloadTorrentFile()
if err != nil {
log.Error().Stack().Err(err).Msgf("filter-service.find_and_check_filters: (%v) could not download torrent file with id: '%v' from: %v", f.Name, release.TorrentID, release.Indexer)
return false, nil, err