Skip to content

Commit f0211f1

Browse files
flythenimbusflythenimbus
committed
lint fix
1 parent 16139b0 commit f0211f1

9 files changed

Lines changed: 49 additions & 47 deletions

File tree

‎desktop/cmd/pam-helper/main.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -507,7 +507,7 @@ func authenticateViaIPC() error {
507507
return fmt.Errorf("FIDO2 auth failed: could not connect to Monban after launch: %w", err)
508508
}
509509
}
510-
defer conn.Close()
510+
defer func() { _ = conn.Close() }()
511511

512512
_ = conn.SetDeadline(time.Now().Add(60 * time.Second))
513513

‎desktop/frontend/src/App.tsx‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -52,15 +52,18 @@ function App() {
5252
const offRollback = Events.On("app:config-rollback-detected", () =>
5353
setRollbackWarning(true),
5454
);
55-
const offIpcAuth = Events.On("ipc:auth-request", (event: { data: IPCAuthRequest }) => {
56-
console.log("[ipc] received ipc:auth-request", event.data);
57-
setIpcAuth(event.data);
58-
setView((prev) => {
59-
console.log("[ipc] switching view from", prev, "to ipc-auth");
60-
setPreviousView(prev);
61-
return "ipc-auth";
62-
});
63-
});
55+
const offIpcAuth = Events.On(
56+
"ipc:auth-request",
57+
(event: { data: IPCAuthRequest }) => {
58+
console.log("[ipc] received ipc:auth-request", event.data);
59+
setIpcAuth(event.data);
60+
setView((prev) => {
61+
console.log("[ipc] switching view from", prev, "to ipc-auth");
62+
setPreviousView(prev);
63+
return "ipc-auth";
64+
});
65+
},
66+
);
6467
return () => {
6568
offLocked();
6669
offRollback();

‎desktop/frontend/src/api.ts‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,10 @@ export const api = {
6262
cancelIPCAuth: (): Promise<void> => App.CancelIPCAuth(),
6363

6464
getPendingIPCAuth: (): Promise<{ user: string; service: string } | null> =>
65-
App.GetPendingIPCAuth() as unknown as Promise<
66-
{ user: string; service: string } | null
67-
>,
65+
App.GetPendingIPCAuth() as unknown as Promise<{
66+
user: string;
67+
service: string;
68+
} | null>,
6869

6970
hideToTray: (): Promise<void> => App.HideToTray(),
7071

‎desktop/frontend/src/components/IPCAuthDialog.tsx‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,7 @@ export function IPCAuthDialog({ service, user, onDone }: IPCAuthDialogProps) {
8383
style={{ WebkitAppRegion: "no-drag" } as React.CSSProperties}
8484
>
8585
<div className="text-center">
86-
<h1 className="text-lg font-semibold text-text">
87-
{label} requested
88-
</h1>
86+
<h1 className="text-lg font-semibold text-text">{label} requested</h1>
8987
<p aria-live="polite" className="text-text-secondary text-sm mt-1">
9088
{!deviceConnected
9189
? "Insert your security key to continue"

‎desktop/internal/app/app_vaults_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ func TestAddPath_DispatchesFile(t *testing.T) {
209209

210210
dir := t.TempDir()
211211
f := filepath.Join(dir, "test.txt")
212-
os.WriteFile(f, []byte("hello"), 0644)
212+
_ = os.WriteFile(f, []byte("hello"), 0644)
213213

214214
// AddPath on a file will call addFile, which requires loading
215215
// secure config from disk.
@@ -222,7 +222,7 @@ func TestAddPath_DispatchesFile(t *testing.T) {
222222
func TestCheckDiskSpace_ValidDir(t *testing.T) {
223223
dir := t.TempDir()
224224
// Write a small file so the folder isn't empty
225-
os.WriteFile(filepath.Join(dir, "test.txt"), []byte("hello world"), 0644)
225+
_ = os.WriteFile(filepath.Join(dir, "test.txt"), []byte("hello world"), 0644)
226226

227227
a := NewApp()
228228
info := a.CheckDiskSpace(dir)

‎desktop/internal/app/ipc.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ func (a *App) ipcAcceptLoop(ctx context.Context) {
102102
}
103103

104104
func (a *App) handleIPCConn(ctx context.Context, conn net.Conn) {
105-
defer conn.Close()
105+
defer func() { _ = conn.Close() }()
106106
_ = conn.SetDeadline(time.Now().Add(ipcAuthTimeout))
107107

108108
// Serialize: only one IPC auth at a time.

‎desktop/internal/app/ipc_test.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,8 @@ func TestStopIPCListener_NilIPC(t *testing.T) {
9191

9292
func TestWriteIPCResponse_Success(t *testing.T) {
9393
server, client := net.Pipe()
94-
defer server.Close()
95-
defer client.Close()
94+
defer func() { _ = server.Close() }()
95+
defer func() { _ = client.Close() }()
9696

9797
go writeIPCResponse(server, monban.IPCResponse{Success: true})
9898

@@ -112,8 +112,8 @@ func TestWriteIPCResponse_Success(t *testing.T) {
112112

113113
func TestWriteIPCResponse_Error(t *testing.T) {
114114
server, client := net.Pipe()
115-
defer server.Close()
116-
defer client.Close()
115+
defer func() { _ = server.Close() }()
116+
defer func() { _ = client.Close() }()
117117

118118
go writeIPCResponse(server, monban.IPCResponse{Error: "test error"})
119119

@@ -133,11 +133,11 @@ func TestWriteIPCResponse_Error(t *testing.T) {
133133

134134
func TestWriteIPCResponse_ClosedConn(t *testing.T) {
135135
server, client := net.Pipe()
136-
client.Close() // close the read end
136+
_ = client.Close() // close the read end
137137

138138
// Should not panic on write error
139139
writeIPCResponse(server, monban.IPCResponse{Success: true})
140-
server.Close()
140+
_ = server.Close()
141141
}
142142

143143
func TestHideToTray_NilWindow(t *testing.T) {

‎desktop/internal/app/update_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ func TestCheckForUpdate_NewVersionAvailable(t *testing.T) {
5454
HTMLURL: "https://github.com/flythenimbus/monban/releases/tag/v99.0.0",
5555
}
5656
w.Header().Set("Content-Type", "application/json")
57-
json.NewEncoder(w).Encode(resp)
57+
_ = json.NewEncoder(w).Encode(resp)
5858
}))
5959
defer srv.Close()
6060

‎desktop/internal/monban/ipc_test.go‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ func shortSocketDir(t *testing.T) string {
1717
if err != nil {
1818
t.Fatal(err)
1919
}
20-
t.Cleanup(func() { os.RemoveAll(dir) })
20+
t.Cleanup(func() { _ = os.RemoveAll(dir) })
2121
return dir
2222
}
2323

@@ -169,7 +169,7 @@ func TestIPCProtocolOverSocket(t *testing.T) {
169169
if err != nil {
170170
t.Fatal(err)
171171
}
172-
defer listener.Close()
172+
defer func() { _ = listener.Close() }()
173173

174174
// Server goroutine: read request, write response.
175175
done := make(chan struct{})
@@ -179,7 +179,7 @@ func TestIPCProtocolOverSocket(t *testing.T) {
179179
if err != nil {
180180
return
181181
}
182-
defer conn.Close()
182+
defer func() { _ = conn.Close() }()
183183

184184
var req IPCRequest
185185
if err := json.NewDecoder(conn).Decode(&req); err != nil {
@@ -192,15 +192,15 @@ func TestIPCProtocolOverSocket(t *testing.T) {
192192

193193
resp := IPCResponse{Success: true}
194194
data, _ := json.Marshal(resp)
195-
conn.Write(data)
195+
_, _ = conn.Write(data)
196196
}()
197197

198198
// Client: connect, send request, read response.
199199
conn, err := net.DialTimeout("unix", sockPath, 2*time.Second)
200200
if err != nil {
201201
t.Fatal(err)
202202
}
203-
defer conn.Close()
203+
defer func() { _ = conn.Close() }()
204204

205205
req := IPCRequest{Type: "auth", User: "alice", Service: "sudo"}
206206
if err := json.NewEncoder(conn).Encode(req); err != nil {
@@ -228,34 +228,34 @@ func TestIPCProtocolOverSocketDenied(t *testing.T) {
228228
if err != nil {
229229
t.Fatal(err)
230230
}
231-
defer listener.Close()
231+
defer func() { _ = listener.Close() }()
232232

233233
go func() {
234234
conn, err := listener.Accept()
235235
if err != nil {
236236
return
237237
}
238-
defer conn.Close()
238+
defer func() { _ = conn.Close() }()
239239

240240
var req IPCRequest
241-
json.NewDecoder(conn).Decode(&req)
241+
_ = json.NewDecoder(conn).Decode(&req)
242242

243243
resp := IPCResponse{Error: "cancelled by user"}
244244
data, _ := json.Marshal(resp)
245-
conn.Write(data)
245+
_, _ = conn.Write(data)
246246
}()
247247

248248
conn, err := net.DialTimeout("unix", sockPath, 2*time.Second)
249249
if err != nil {
250250
t.Fatal(err)
251251
}
252-
defer conn.Close()
252+
defer func() { _ = conn.Close() }()
253253

254254
req := IPCRequest{Type: "auth", User: "bob", Service: "authorization"}
255-
json.NewEncoder(conn).Encode(req)
255+
_ = json.NewEncoder(conn).Encode(req)
256256

257257
var resp IPCResponse
258-
json.NewDecoder(conn).Decode(&resp)
258+
_ = json.NewDecoder(conn).Decode(&resp)
259259

260260
if resp.Success {
261261
t.Error("expected denied response")
@@ -274,7 +274,7 @@ func TestIPCConcurrentConnectionsRejected(t *testing.T) {
274274
if err != nil {
275275
t.Fatal(err)
276276
}
277-
defer listener.Close()
277+
defer func() { _ = listener.Close() }()
278278

279279
// Simulate a server that holds the first connection busy.
280280
var activeConn net.Conn
@@ -290,24 +290,24 @@ func TestIPCConcurrentConnectionsRejected(t *testing.T) {
290290
if err != nil {
291291
return
292292
}
293-
defer conn2.Close()
293+
defer func() { _ = conn2.Close() }()
294294

295295
var req IPCRequest
296-
json.NewDecoder(conn2).Decode(&req)
296+
_ = json.NewDecoder(conn2).Decode(&req)
297297

298298
resp := IPCResponse{Error: "another auth request is in progress"}
299299
data, _ := json.Marshal(resp)
300-
conn2.Write(data)
300+
_, _ = conn2.Write(data)
301301
}()
302302

303303
// First client connects (held busy).
304304
conn1, _ := net.DialTimeout("unix", sockPath, 2*time.Second)
305305
defer func() {
306306
if conn1 != nil {
307-
conn1.Close()
307+
_ = conn1.Close()
308308
}
309309
if activeConn != nil {
310-
activeConn.Close()
310+
_ = activeConn.Close()
311311
}
312312
}()
313313
<-ready
@@ -317,13 +317,13 @@ func TestIPCConcurrentConnectionsRejected(t *testing.T) {
317317
if err != nil {
318318
t.Fatal(err)
319319
}
320-
defer conn2.Close()
320+
defer func() { _ = conn2.Close() }()
321321

322322
req := IPCRequest{Type: "auth", User: "eve", Service: "sudo"}
323-
json.NewEncoder(conn2).Encode(req)
323+
_ = json.NewEncoder(conn2).Encode(req)
324324

325325
var resp IPCResponse
326-
json.NewDecoder(conn2).Decode(&resp)
326+
_ = json.NewDecoder(conn2).Decode(&resp)
327327

328328
if resp.Success {
329329
t.Error("second connection should be rejected")

0 commit comments

Comments
 (0)