From 0ef35cae1a385f26f3d5a0ad6306b09d1fed3abd Mon Sep 17 00:00:00 2001 From: Andinus Date: Sat, 11 Apr 2020 16:28:40 +0530 Subject: Return better errors in hibp package --- hibp/hash.go | 4 ++-- hibp/req.go | 39 ++++++++++++++++++++++++++++++--------- 2 files changed, 32 insertions(+), 11 deletions(-) (limited to 'hibp') diff --git a/hibp/hash.go b/hibp/hash.go index 25249ed..9b8d35c 100644 --- a/hibp/hash.go +++ b/hibp/hash.go @@ -6,8 +6,8 @@ import ( "strings" ) -// GetHsh takes a string as an input & returns SHA-1 Hash -func GetHsh(pass string) string { +// GetSHA1Hash takes a string as an input & returns SHA-1 Hash +func GetSHA1Hash(pass string) string { alg := sha1.New() alg.Write([]byte(pass)) diff --git a/hibp/req.go b/hibp/req.go index a3085da..8081d3c 100644 --- a/hibp/req.go +++ b/hibp/req.go @@ -4,32 +4,53 @@ import ( "fmt" "io/ioutil" "net/http" + "time" ) -func reqHIBP(reqApi string) (string, error) { +func reqHIBP(reqApi string) (body string, err error) { + c := http.Client{ + // TODO: timeout should be configurable by the user + Timeout: time.Second * 64, + } + req, err := http.NewRequest(http.MethodGet, reqApi, nil) if err != nil { - return "", fmt.Errorf("request init failed\n%s", + err = fmt.Errorf("hibp/req.go: Failed to create request\n%s", err.Error()) + return } - c := http.Client{} + // User-Agent should be passed with every request to + // make work easier for the server handler. Include contact + // information along with the project name so they could reach + // you if required. + req.Header.Set("User-Agent", + "Andinus / Orion - https://andinus.nand.sh/orion") + res, err := c.Do(req) if err != nil { - return "", fmt.Errorf("request failed\n%s", + err = fmt.Errorf("hibp/req.go: Failed to get response\n%s", err.Error()) + return } defer res.Body.Close() if res.StatusCode != 200 { - return "", fmt.Errorf("Unexpected response status code received: %d %s", - res.StatusCode, http.StatusText(res.StatusCode)) + fmt.Errorf("hibp/req.go: Unexpected response status code received: %d %s", + res.StatusCode, + http.StatusText(res.StatusCode)) + return } - body, err := ioutil.ReadAll(res.Body) + // This will read everything to memory and is okay to use here + // because the response is expected to be small. + out, err := ioutil.ReadAll(res.Body) if err != nil { - return "", fmt.Errorf("reading res.Body failed\n%s", + fmt.Errorf("hibp/req.go: Failed to read res.Body\n%s", err.Error()) + return } - return string(body), err + + body = string(out) + return } -- cgit 1.4.1-2-gfad0 fb5cc2b1fccd4380cb247f19aafec1'>root/numericx.c
blob: 3518fccea3f9edd3da4a6ef772f5b196d69112a7 (plain) (tree) 
acc2126 ^



4f221f3






a1447b8 ^


ad3f14e ^



acc2126 ^




6752a1a ^


acc2126 ^







acc2126 ^


ad3f14e ^

310002d ^

dcc93c0 ^



acc2126 ^






310002d ^

dcc93c0 ^



acc2126 ^




ad3f14e ^

acc2126 ^

ad3f14e ^

310002d ^




acc2126 ^







310002d ^




acc2126 ^




ad3f14e ^




df82e9e ^




acc2126 ^








df82e9e ^




acc2126 ^

ad3f14e ^



acc2126 ^







4f221f3


acc2126 ^



4f221f3


ad3f14e ^



acc2126 ^



ad3f14e ^




acc2126 ^

6752a1a ^

acc2126 ^



4f221f3




acc2126 ^


4f221f3

a1447b8 ^

4f221f3



acc2126 ^



4f221f3

acc2126 ^

4f221f3


acc2126 ^



ad3f14e ^




acc2126 ^





ad3f14e ^


df82e9e ^















acc2126 ^



ad3f14e ^



acc2126 ^







ad3f14e ^

4f221f3

06d3c41 ^

4f221f3






06d3c41 ^

4f221f3

06d3c41 ^

4f221f3










acc2126 ^



ad3f14e ^


6752a1a ^


acc2126 ^





ad3f14e ^

43398cf ^

ad3f14e ^

43398cf ^

ad3f14e ^

43398cf ^

ad3f14e ^

43398cf ^
















acc2126 ^



ad3f14e ^


acc2126 ^





ad3f14e ^

4f221f3

4f221f3

















acc2126 ^



ad3f14e ^

acc2126 ^


ad3f14e ^

4f221f3



dcc93c0 ^

4f221f3

dcc93c0 ^
















4f221f3

4f221f3


acc2126 ^




ad3f14e ^

dcc93c0 ^














acc2126 ^



ad3f14e ^





acc2126 ^





ad3f14e ^

90c8698 ^


06bb899 ^















acc2126 ^






ad3f14e ^

90c8698 ^













2fe9950 ^

327de4f ^

2fe9950 ^

6752a1a ^

327de4f ^

2fe9950 ^

327de4f ^

2fe9950 ^






ad3f14e ^

acc2126 ^

327de4f ^

acc2126 ^

327de4f ^

2fe9950 ^

327de4f ^


2fe9950 ^

6752a1a ^

327de4f ^

acc2126 ^

2fe9950 ^


4f221f3

2fe9950 ^




ef7e6f9 ^

2fe9950 ^


ef7e6f9 ^


2fe9950 ^


4f221f3

2fe9950 ^


















4f221f3

2fe9950 ^






327de4f ^







6752a1a ^



327de4f ^

6752a1a ^




4eb7879 ^

327de4f ^

4eb7879 ^

6752a1a ^


4eb7879 ^

2fe9950 ^

4eb7879 ^


2fe9950 ^

4eb7879 ^



4f221f3

06bb899 ^


4eb7879 ^

06bb899 ^

4f221f3







2fe9950 ^

dcc93c0 ^



4f221f3


df82e9e ^



2fe9950 ^

df82e9e ^





4f221f3

43398cf ^

2fe9950 ^

43398cf ^

2fe9950 ^

43398cf ^



90c8698 ^


4eb7879 ^

43398cf ^

4eb7879 ^

43398cf ^



2fe9950 ^

06d3c41 ^

43398cf ^


2dd0e86 ^



2fe9950 ^

2dd0e86 ^


4f221f3

dcc93c0 ^

4f221f3

2fe9950 ^

2dd0e86 ^

06d3c41 ^


4f221f3

06d3c41 ^

4f221f3

4f221f3

2fe9950 ^

4eb7879 ^

4f221f3

90c8698 ^

90c8698 ^



4eb7879 ^

2fe9950 ^





4eb7879 ^



6752a1a ^


2fe9950 ^

6752a1a ^

4eb7879 ^

6752a1a ^



2fe9950 ^








fd66c37 ^

2fe9950 ^



















2fe9950 ^

4eb7879 ^


2fe9950 ^


4eb7879 ^

2fe9950 ^


4eb7879 ^















2fe9950 ^

4eb7879 ^

2fe9950 ^


4eb7879 ^


2fe9950 ^











4f221f3


1
2
3

4
5
6
7
8
9

10
11

12
13
14

15
16
17
18

19
20

21
22
23
24
25
26
27

28
29

30

31

32
33
34

35
36
37
38
39
40

41

42
43
44

45
46
47
48

49

50

51

52
53
54
55

56
57
58
59
60
61
62

63
64
65
66

67
68
69
70

71
72
73
74

75
76
77
78

79
80
81
82
83
84
85
86

87
88
89
90

91

92
93
94

95
96
97
98
99
100
101

102
103

104
105
106

107
108

109
110
111

112
113
114

115
116
117
118

119

120

121
122
123

124
125
126
127

128
129

130

131

132
133
134

135
136
137

138

139

140
141

142
143
144

145
146
147
148

149
150
151
152
153

154
155

156
157
158
159
160
161
162
163
164
165
166
167
168
169
170

171
172
173

174
175
176

177
178
179
180
181
182
183

184

185

186

187
188
189
190
191
192

193

194

195

196
197
198
199
200
201
202
203
204
205

206
207
208

209
210

211
212

213
214
215
216
217

218

219

220

221

222

223

224

225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240

241
242
243

244
245

246
247
248
249
250

251

252

253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269

270
271
272

273

274
275

276

277
278
279

280

281

282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297

298

299
300

301
302
303
304

305

306
307
308
309
310
311
312
313
314
315
316
317
318
319

320
321
322

323
324
325
326
327

328
329
330
331
332

333

334
335

336
337
338
339
340
341
342
343
344
345
346
347
348
349
350

351
352
353
354
355
356

357

358
359
360
361
362
363
364
365
366
367
368
369
370

371

372

373

374

375

376

377

378
379
380
381
382
383

384

385

386

387

388

389

390
391

392

393

394

395

396
397

398

399
400
401
402

403

404
405

406
407

408
409

410

411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428

429

430
431
432
433
434
435

436
437
438
439
440
441
442

443
444
445

446

447
448
449
450

451

452

453

454
455

456

457

458
459

460

461
462
463

464

465
466

467

468

469
470
471
472
473
474
475

476

477
478
479

480
481

482
483
484

485

486
487
488
489
490

491

492

493

494

495

496
497
498

499
500

501

502

503

504
505
506

507

508

509
510

511
512
513

514

515
516

517

518

519

520

521

522
523

524

525

526

527

528

529

530

531

532
533
534

535

536
537
538
539
540

541
542
543

544
545

546

547

548

549
550
551

552
553
554
555
556
557
558
559

560

561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579

580

581
582

583
584

585

586
587

588
589
590
591
592
593
594
595
596
597
598
599
600
601
602

603

604

605
606

607
608

609
610
611
612
613
614
615
616
617
618
619

620
621