Skip to content

Improve error handling in htmlToText function #2309

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Mzack9999 merged 3 commits into from
Nov 18, 2025
Merged

Improve error handling in htmlToText function #2309

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7c94f19
Improve error handling in htmlToText function
GDATTACKER-RESEARCHER Nov 17, 2025
4ed7148
Merge branch 'dev' into dev
GDATTACKER-RESEARCHER Nov 17, 2025
05c6364
better error handling
Mzack9999 Nov 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion common/httpx/httpx.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package httpx

import (
"context"
"crypto/tls"
"fmt"
"io"
Expand All @@ -25,7 +26,6 @@ import (
pdhttputil "github.com/projectdiscovery/utils/http"
stringsutil "github.com/projectdiscovery/utils/strings"
urlutil "github.com/projectdiscovery/utils/url"
"golang.org/x/net/context"
"golang.org/x/net/http2"
)

Expand Down
19 changes: 8 additions & 11 deletions common/pagetypeclassifier/pagetypeclassifier.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,26 +14,23 @@ type PageTypeClassifier struct {
classifier *naive_bayes.NaiveBayesClassifier
}

func New() *PageTypeClassifier {
func New() (*PageTypeClassifier, error) {
classifier, err := naive_bayes.NewClassifierFromFileData(classifierData)
if err != nil {
panic(err)
return nil, err
}
return &PageTypeClassifier{classifier: classifier}
return &PageTypeClassifier{classifier: classifier}, nil
}

func (n *PageTypeClassifier) Classify(html string) string {
text := htmlToText(html)
if text == "" {
text, err := htmlToText(html)
if err != nil || text == "" {
return "other"
}
return n.classifier.Classify(text)
}

func htmlToText(html string) string {
text, err := htmltomarkdown.ConvertString(html)
if err != nil {
panic(err)
}
return text
// htmlToText safely converts HTML to text and protects against panics from Go's HTML parser.
func htmlToText(html string) (string, error) {
return htmltomarkdown.ConvertString(html)
}
19 changes: 12 additions & 7 deletions common/pagetypeclassifier/pagetypeclassifier_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,22 @@ package pagetypeclassifier
import (
"testing"

"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)

func TestPageTypeClassifier(t *testing.T) {

t.Run("test creation of new PageTypeClassifier", func(t *testing.T) {
epc := New()
assert.NotNil(t, epc)
epc, err := New()
require.NoError(t, err)
require.NotNil(t, epc)
})

t.Run("test classification non error page text", func(t *testing.T) {
epc := New()
assert.Equal(t, "nonerror", epc.Classify(`<!DOCTYPE html>
epc, err := New()
require.NoError(t, err)
require.NotNil(t, epc)
require.Equal(t, "nonerror", epc.Classify(`<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
Expand All @@ -30,8 +33,10 @@ func TestPageTypeClassifier(t *testing.T) {
})

t.Run("test classification on error page text", func(t *testing.T) {
epc := New()
assert.Equal(t, "error", epc.Classify(`<!DOCTYPE html>
epc, err := New()
require.NoError(t, err)
require.NotNil(t, epc)
require.Equal(t, "error", epc.Classify(`<!DOCTYPE html>
<html>
<head>
<title>Error 403: Forbidden</title>
Expand Down
6 changes: 5 additions & 1 deletion runner/runner.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,7 +385,11 @@ func New(options *Options) (*Runner, error) {
}

runner.simHashes = gcache.New[uint64, struct{}](1000).ARC().Build()
runner.pageTypeClassifier = pagetypeclassifier.New()
pageTypeClassifier, err := pagetypeclassifier.New()
if err != nil {
return nil, err
}
runner.pageTypeClassifier = pageTypeClassifier

if options.HttpApiEndpoint != "" {
apiServer := NewServer(options.HttpApiEndpoint, options)
Expand Down
Loading