Skip to content
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.

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

feat: skip HTTP auth when connected via USB #104

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 4 additions & 1 deletion auth.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,17 @@ package main
import (
"fmt"
"net/http"

"github.com/owulveryck/goMarkableStream/internal/remarkable"
)

// BasicAuthMiddleware is a middleware function that adds basic authentication to a handler
func BasicAuthMiddleware(next http.Handler) http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
skipAuth := remarkable.HostsIP(r.RemoteAddr)
// Check if the request is authenticated
user, pass, ok := r.BasicAuth()
if !ok || !checkCredentials(user, pass) {
if !skipAuth && (!ok || !checkCredentials(user, pass)) {
// Authentication failed, send a 401 Unauthorized response
w.Header().Set("WWW-Authenticate", `Basic realm="Restricted"`)
w.WriteHeader(http.StatusUnauthorized)
Expand Down
49 changes: 49 additions & 0 deletions internal/remarkable/ip.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
package remarkable

import (
"errors"
"fmt"
"net"
"strings"
)

func HostsIP(addr string) bool {

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

warning: exported function HostsIP should have comment or be unexported (golint)

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

warning: exported function HostsIP should have comment or be unexported (golint)

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

warning: exported function HostsIP should have comment or be unexported (golint)

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

warning: exported function HostsIP should have comment or be unexported (golint)

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

warning: exported function HostsIP should have comment or be unexported (golint)

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

warning: exported function HostsIP should have comment or be unexported (golint)

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

warning: exported function HostsIP should have comment or be unexported (golint)

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

warning: exported function HostsIP should have comment or be unexported (golint)

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

warning: exported function HostsIP should have comment or be unexported (golint)

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

warning: exported function HostsIP should have comment or be unexported (golint)

if strings.Contains(addr, ":") {
addr = addr[:strings.Index(addr, ":")]
}
ip := net.ParseIP(addr)
if ip == nil {
return false
}

mask, err := getMask()
if err != nil {
return false
}

return mask.Contains(ip)
}

func getMask() (*net.IPNet, error) {
iface, err := net.InterfaceByName("usb1")
if err != nil {
return nil, fmt.Errorf("failed to locate usb1 interface: %w", err)
}

addrs, err := iface.Addrs()
if err != nil {
return nil, fmt.Errorf("failed to enumerate ips for usb1 interface: %w", err)
}

for _, addr := range addrs {
ip, mask, err := net.ParseCIDR(addr.String())
if err != nil {
continue
}

if strings.HasSuffix(ip.String(), ".1") {
return mask, nil
}
}
return nil, errors.New("no expected ip found on usb interface")
}