Feat/repo transfer and improve socket check

.github/workflows/test.yml

@@ -23,4 +23,4 @@ jobs:
         uses: goreleaser/goreleaser-action@f06c13b6b1a9625abc9e6e439d9c05a8f2190e94 # v7.2.3
         with:
           version: latest
-          args: build --snapshot
+          args: build --snapshot

.goreleaser.yml

@@ -5,12 +5,10 @@ builds:
     goarch:
       - amd64
       - arm64
-    ldflags:
-      - -w -s -X main.version={{.Version}} -X github.com/kazeburo/mackerel-plugin-maxcpu/maxcpu.version={{.Version}}
 archives:
   - format: zip
     name_template: "{{ .ProjectName }}_{{ .Os }}_{{ .Arch }}"
 release:
   github:
-    owner: kazeburo
+    owner: monitoring-forge
     name: mackerel-plugin-maxcpu

Makefile

@@ -1,5 +1,6 @@
 VERSION=0.0.15
-LDFLAGS=-ldflags "-w -s -X main.version=${VERSION} -X github.com/kazeburo/mackerel-plugin-maxcpu/maxcpu.version=${VERSION}"
+GITCOMMIT?=$(shell git describe --dirty --always)
+LDFLAGS=-ldflags "-w -s -X main.version=${VERSION} -X main.commit=${GITCOMMIT}"
 
 all: mackerel-plugin-maxcpu
 
@@ -29,6 +30,7 @@ linux-check: mackerel-plugin-maxcpu
 	pkill -f $$tmpfile'
 
 check:
-	go test ./...
+	go test -v ./...
+	go test -race ./...
 	go vet ./...
 

README.md

@@ -26,11 +26,11 @@ At the first time of execution, mackerel-plugin-maxcpu spawns the calculating da
 Sample
 
 ```
-$ ./mackerel-plugin-maxcpu --socket /tmp/maxcpu.sock
-2020/10/30 10:40:54 rpc error: code = Unavailable desc = connection error: desc = "transport: Error while dialing dial unix /tmp/maxcpu.sock: connect: no such file or directory"
+$ sudo ./mackerel-plugin-maxcpu --socket /var/run/maxcpu.sock
+2020/10/30 10:40:54 check daemon alive failed: rpc error: code = Unavailable desc = connection error: desc = "transport: Error while dialing dial unix /var/run/maxcpu.sock: connect: no such file or directory"
 2020/10/30 10:40:54 start background process
 
-$ ./mackerel-plugin-maxcpu --socket /tmp/maxcpu.sock
+$ sudo ./mackerel-plugin-maxcpu --socket /var/run/maxcpu.sock
 maxcpu.us_sy_wa_si_st_usage.max 0.251256        1604022058
 maxcpu.us_sy_wa_si_st_usage.min 0.250627        1604022058
 maxcpu.us_sy_wa_si_st_usage.avg 0.250941        1604022058
@@ -40,5 +40,5 @@ maxcpu.us_sy_wa_si_st_usage.75pt        0.251256        1604022058
 
 ## Install
 
-Please download release page or `mkr plugin install kazeburo/mackerel-plugin-maxcpu`.
+Please download release page or `mkr plugin install monitoring-forge/mackerel-plugin-maxcpu`.
 

go.mod

@@ -1,4 +1,4 @@
-module github.com/kazeburo/mackerel-plugin-maxcpu
+module github.com/monitoring-forge/mackerel-plugin-maxcpu
 
 go 1.25.0
 

internal/statworker/command.go

@@ -9,7 +9,7 @@ import (
 	"time"
 
 	"github.com/bufbuild/connect-go"
-	"github.com/kazeburo/mackerel-plugin-maxcpu/maxcpu"
+	"github.com/monitoring-forge/mackerel-plugin-maxcpu/maxcpu"
 	"google.golang.org/protobuf/types/known/emptypb"
 )
 

main.go

@@ -9,19 +9,20 @@ import (
 	"os"
 	"os/exec"
 	"os/signal"
+	"path/filepath"
 	"runtime"
 	"syscall"
 	"time"
 
 	connect "github.com/bufbuild/connect-go"
 	"github.com/jessevdk/go-flags"
-	"github.com/kazeburo/mackerel-plugin-maxcpu/internal/statworker"
-	maxcpuconnect "github.com/kazeburo/mackerel-plugin-maxcpu/maxcpu/maxcpuconnect"
+	"github.com/monitoring-forge/mackerel-plugin-maxcpu/internal/statworker"
+	maxcpuconnect "github.com/monitoring-forge/mackerel-plugin-maxcpu/maxcpu/maxcpuconnect"
 	"google.golang.org/protobuf/types/known/emptypb"
 )
 
-// version by Makefile
 var version string
+var commit string
 
 type Opt struct {
 	Socket   string `short:"s" long:"socket" required:"true" description:"Socket file used calcurating daemon" `
@@ -122,6 +123,10 @@ func runBackground(opt *Opt) int {
 		log.Printf("%v", err)
 		return 1
 	}
+	if err := os.Chmod(opt.Socket, 0600); err != nil {
+		log.Printf("%v", err)
+		return 1
+	}
 	srv := &http.Server{Handler: mux}
 	go func() {
 		if err := srv.Serve(unixListener); err != nil && err != http.ErrServerClosed {
@@ -167,10 +172,26 @@ func getStats(opt *Opt) int {
 }
 
 func makeClient(socket string) (maxcpuconnect.MaxCPUClient, error) {
+	uid := os.Geteuid()
 	httpClient := &http.Client{
 		Transport: &http.Transport{
 			DialContext: func(ctx context.Context, network, addr string) (net.Conn, error) {
-				return net.DialTimeout("unix", socket, 1*time.Second)
+				// check owner of socket file
+				fi, err := os.Stat(socket)
+				if err != nil {
+					return nil, err
+				}
+				stat, ok := fi.Sys().(*syscall.Stat_t)
+				if !ok {
+					return nil, fmt.Errorf("failed to get socket file stat")
+				}
+				if int(stat.Uid) != uid {
+					return nil, fmt.Errorf("socket file owner is not current user")
+				}
+				ctx, cancel := context.WithTimeout(ctx, 1*time.Second)
+				defer cancel()
+				var d net.Dialer
+				return d.DialContext(ctx, "unix", socket)
 			},
 		},
 	}
@@ -188,13 +209,17 @@ func _main() int {
 	psr := flags.NewParser(opt, flags.HelpFlag|flags.PassDoubleDash)
 	_, err := psr.Parse()
 	if opt.Version {
-		fmt.Printf(`%s %s
-Compiler: %s %s
-`,
-			os.Args[0],
+		if commit == "" {
+			commit = "dev"
+		}
+		fmt.Printf(
+			"%s-%s\n%s/%s, %s, %s\n",
+			filepath.Base(os.Args[0]),
 			version,
-			runtime.Compiler,
-			runtime.Version())
+			runtime.GOOS,
+			runtime.GOARCH,
+			runtime.Version(),
+			commit)
 		return 0
 	}
 	if err != nil {

main_test.go

@@ -10,8 +10,8 @@ import (
 	"time"
 
 	connect "github.com/bufbuild/connect-go"
-	"github.com/kazeburo/mackerel-plugin-maxcpu/internal/statworker"
-	maxcpuconnect "github.com/kazeburo/mackerel-plugin-maxcpu/maxcpu/maxcpuconnect"
+	"github.com/monitoring-forge/mackerel-plugin-maxcpu/internal/statworker"
+	maxcpuconnect "github.com/monitoring-forge/mackerel-plugin-maxcpu/maxcpu/maxcpuconnect"
 	"google.golang.org/protobuf/types/known/emptypb"
 )
 

maxcpu.proto

@@ -1,14 +1,14 @@
 syntax = "proto3";
 // go install google.golang.org/protobuf/cmd/protoc-gen-go@latest
-// go install google.golang.org/grpc/protoc-gen-go-grpc@lastest
+// go install google.golang.org/grpc/protoc-gen-go-grpc@latest
 // go install github.com/bufbuild/connect-go/cmd/protoc-gen-connect-go@latest
 // protoc --go_out=maxcpu --go_opt=paths=source_relative maxcpu.proto
 // protoc --connect-go_out=maxcpu --connect-go_opt=paths=source_relative maxcpu.proto
 
 import "google/protobuf/empty.proto";
 
 package maxcpu;
-option go_package = "github.com/kazeburo/mackerel-plugin-maxcpu/maxcpu";
+option go_package = "github.com/monitoring-forge/mackerel-plugin-maxcpu/maxcpu";
 
 service MaxCPU {
   rpc GetStats(google.protobuf.Empty) returns (StatsResponse) {}