mirror/discord-downloader-go
3
0
Fork 0
mirror of https://github.com/get-got/discord-downloader-go.git synced 2025-10-29 19:46:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

FIX: URL parse failure was causing fatal crash

Browse Source
This commit is contained in:
Drn 2024-06-02 12:35:22 -07:00
parent 636fe6349c
commit a2d1c0f81f
1 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
downloads.go
View File

@ -756,35 +756,37 @@ func (download downloadRequestStruct) tryDownload() (downloadStatusStruct, int64
}
// Check Domain
domain := "<DOMAIN PARSE FAILED>"
parsedURL, err := url.Parse(download.InputURL)
if err != nil {
log.Println(lg("Download", "", color.RedString, "Error while parsing url:\t%s", err))
}
domain := parsedURL.Hostname()
if sourceConfig.Filters.AllowedDomains != nil || sourceConfig.Filters.BlockedDomains != nil {
shouldAbort := false
if sourceConfig.Filters.AllowedDomains != nil {
shouldAbort = true
}
if sourceConfig.Filters.BlockedDomains != nil {
if stringInSlice(domain, *sourceConfig.Filters.BlockedDomains) {
} else {
domain = parsedURL.Hostname()
if sourceConfig.Filters.AllowedDomains != nil || sourceConfig.Filters.BlockedDomains != nil {
shouldAbort := false
if sourceConfig.Filters.AllowedDomains != nil {
shouldAbort = true
}
}
if sourceConfig.Filters.AllowedDomains != nil {
if stringInSlice(domain, *sourceConfig.Filters.AllowedDomains) {
shouldAbort = false
}
}
// Abort
if shouldAbort {
if !download.HistoryCmd {
log.Println(lg("Download", "Skip", color.GreenString,
"Unpermitted domain (%s) found at %s", domain, download.InputURL))
if sourceConfig.Filters.BlockedDomains != nil {
if stringInSlice(domain, *sourceConfig.Filters.BlockedDomains) {
shouldAbort = true
}
}
if sourceConfig.Filters.AllowedDomains != nil {
if stringInSlice(domain, *sourceConfig.Filters.AllowedDomains) {
shouldAbort = false
}
}
// Abort
if shouldAbort {
if !download.HistoryCmd {
log.Println(lg("Download", "Skip", color.GreenString,
"Unpermitted domain (%s) found at %s", domain, download.InputURL))
}
return mDownloadStatus(downloadSkippedUnpermittedDomain), 0
}
return mDownloadStatus(downloadSkippedUnpermittedDomain), 0
}
}