Merge branch 'develop' into further-txt-mappings

Author: rxerium

.github/workflows/go.yml

@@ -12,7 +12,7 @@ jobs:
     strategy:
       matrix:
         os: [ "ubuntu-latest", "macos-latest", "windows-latest" ]
-        go-version: [ "1.25.5" ]
+        go-version: [ "1.26.0" ]
     runs-on: ${{ matrix.os }}
     env:
       CGO_ENABLED: 0
@@ -42,9 +42,8 @@ jobs:
       - name: setup Go
         uses: actions/setup-go@v5
         with:
-          go-version: 1.25.5
+          go-version: 1.26.0
       - name: checkout
         uses: actions/checkout@v4
       - name: measure coverage
         run: go test -v -coverprofile=coverage.out ./...
-

.github/workflows/goreleaser.yml

@@ -23,7 +23,7 @@ jobs:
         name: set up Go
         uses: actions/setup-go@v5
         with:
-          go-version: 1.25.5
+          go-version: 1.26.0
       -
         name: run GoReleaser
         uses: goreleaser/goreleaser-action@v6

.github/workflows/lint.yml

@@ -10,7 +10,7 @@ jobs:
     strategy:
       matrix:
         os: [ "ubuntu-latest", "macos-latest", "windows-latest" ]
-        go-version: [ "1.25.5" ]
+        go-version: [ "1.26.0" ]
     runs-on: ${{ matrix.os }}
     env:
       CGO_ENABLED: 0

Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.25.5-alpine AS build
+FROM golang:1.26.0-alpine AS build
 RUN apk --no-cache add git
 WORKDIR /go/src/github.com/owasp-amass/amass
 COPY . .

LICENSE

@@ -190,7 +190,7 @@ License: Apache2.0
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2017-2025 Jeff Foley
+   Copyright 2017-2026 Jeff Foley
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

README.md

@@ -30,6 +30,6 @@ If you need help with installation and/or usage of the tool, please join our [Di
 
 ## Licensing [![License](https://img.shields.io/badge/license-apache%202-blue)](https://www.apache.org/licenses/LICENSE-2.0)
 
-This program is free software: you can redistribute it and/or modify it under the terms of the [Apache license](LICENSE). OWASP Amass and any contributions are Copyright © by Jeff Foley 2017-2025. Some subcomponents have separate licenses.
+This program is free software: you can redistribute it and/or modify it under the terms of the [Apache license](LICENSE). OWASP Amass and any contributions are Copyright © by Jeff Foley 2017-2026. Some subcomponents have separate licenses.
 
 ![Network graph](https://raw.githubusercontent.com/owasp-amass/docs/master/images/network_06092018.png "Amass Network Mapping")

cmd/ae_isready/main.go

@@ -1,4 +1,4 @@
-// Copyright © by Jeff Foley 2017-2025. All rights reserved.
+// Copyright © by Jeff Foley 2017-2026. All rights reserved.
 // Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file.
 // SPDX-License-Identifier: Apache-2.0
 
@@ -12,7 +12,7 @@ import (
 	"path"
 	"time"
 
-	amasshttp "github.com/owasp-amass/amass/v5/internal/net/http"
+	client "github.com/owasp-amass/amass/v5/engine/api/client/v1"
 )
 
 func main() {
@@ -27,24 +27,24 @@ func main() {
 	flag.BoolVar(&help1, "h", false, "Show the program usage message")
 	flag.BoolVar(&help2, "help", false, "Show the program usage message")
 	flag.StringVar(&hostname, "host", "", "Hostname or IP address of the Amass Engine")
-	//flag.BoolVar(&version, "version", false, "Print the version number of this Amass binary")
 	flag.Parse()
 
 	if (help1 || help2) || hostname == "" {
 		fmt.Fprintf(os.Stderr, "Usage: %s %s\n\n", path.Base(os.Args[0]), "--host HOSTNAME")
 		flag.PrintDefaults()
 		return
 	}
-	/*if version {
-		fmt.Fprintf(color.Error, "%s\n", format.Version)
-		return
-	}*/
 
-	ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second)
+	c, err := client.NewClient("http://" + hostname + ":4000")
+	if err != nil {
+		os.Exit(1)
+	}
+	defer c.Close()
+
+	ctx, cancel := context.WithTimeout(context.Background(), 2*time.Second)
 	defer cancel()
 
-	u := "http://" + hostname + ":4000/graphql"
-	if _, err := amasshttp.RequestWebPage(ctx, &amasshttp.Request{URL: u}); err != nil {
+	if !c.HealthCheck(ctx) {
 		// a failure to respond indicates that the server is not yet available
 		os.Exit(1)
 	}

cmd/amass/main.go

@@ -1,4 +1,4 @@
-// Copyright © by Jeff Foley 2017-2025. All rights reserved.
+// Copyright © by Jeff Foley 2017-2026. All rights reserved.
 // Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file.
 // SPDX-License-Identifier: Apache-2.0
 

cmd/amass/process.go

@@ -1,25 +1,30 @@
-// Copyright © by Jeff Foley 2017-2025. All rights reserved.
+// Copyright © by Jeff Foley 2017-2026. All rights reserved.
 // Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file.
 // SPDX-License-Identifier: Apache-2.0
 
 package main
 
 import (
+	"context"
 	"fmt"
 	"io"
 	"os"
+	"time"
 
-	"github.com/google/uuid"
-	"github.com/owasp-amass/amass/v5/engine/api/client"
+	client "github.com/owasp-amass/amass/v5/engine/api/client/v1"
 )
 
 func engineIsRunning() bool {
-	c := client.NewClient("http://127.0.0.1:4000/")
-
-	if _, err := c.SessionStats(uuid.New()); err != nil && err.Error() == "session not found" {
-		return true
+	c, err := client.NewClient("http://127.0.0.1:4000")
+	if err != nil {
+		return false
 	}
-	return false
+	defer c.Close()
+
+	ctx, cancel := context.WithTimeout(context.Background(), 2*time.Second)
+	defer cancel()
+
+	return c.HealthCheck(ctx)
 }
 
 func startEngine() error {

cmd/amass/process_unix.go

@@ -1,6 +1,6 @@
 //go:build !windows
 
-// Copyright © by Jeff Foley 2017-2025. All rights reserved.
+// Copyright © by Jeff Foley 2017-2026. All rights reserved.
 // Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file.
 // SPDX-License-Identifier: Apache-2.0