-
Notifications
You must be signed in to change notification settings - Fork 0
/
source.go
329 lines (264 loc) · 5.83 KB
/
source.go
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
package main
import (
"bufio"
"fmt"
"io"
"log"
"os"
"path/filepath"
"strings"
"sync"
"github.com/go-resty/resty/v2"
"github.com/maxim2266/csvplus"
"github.com/pkg/errors"
)
// -----
type Sourcer interface {
Check(req *resty.Client) bool
AddTo(r *Results)
}
type URL struct {
H string
}
func NewURL(u string) *URL {
return &URL{H: u}
}
// XXX
func (u *URL) Check(c *resty.Client) bool {
r, _ := handleURL(c, u.H)
if r == u.H {
return true
}
return false
}
func (u *URL) AddTo(r *Results) {
verbose("U")
r.Add("url", u.H)
}
type Filename struct {
Name string
}
func NewFilename(s string) *Filename {
return &Filename{Name: s}
}
func (f *Filename) Check(c *resty.Client) bool {
return true
}
func (f *Filename) AddTo(r *Results) {
verbose("F")
r.Add("filename", f.Name)
}
// -----
type List struct {
s []Sourcer
files []string
}
// NewList create a new list from sources, either URL or a CIMBL filename
// NewList() with another filename is not supported although an URL is.
func NewList(files []string) *List {
if files == nil || len(files) == 0 {
return &List{}
}
l := &List{}
for _, e := range files {
if strings.HasPrefix(e, "http:") {
l.Add(NewURL(e))
} else if strings.HasSuffix(e, ".txt") {
if l, err := l.AddFromIP(e); err != nil {
log.Printf("Invalid IP list: %s", e)
return l
}
} else if REFile.MatchString(e) {
var err error
l, err = l.AddFromFile(e)
if err != nil {
log.Printf("%v: reading error: %v", e, errors.Wrap(err, "AddFromFile"))
}
} else {
log.Printf("invalid filename")
}
}
return l
}
func (l *List) Add(s Sourcer) *List {
debug("adding %#v", s)
l.s = append(l.s, s)
return l
}
func (l *List) Length() int {
return len(l.s)
}
func (l *List) AddFromFile(fn string) (*List, error) {
var (
base string
err error
)
if _, err := os.Stat(fn); err != nil {
return l, errors.Wrapf(err, "unknown fn %s", fn)
}
base = fn
// Special case for .zip.asc
if strings.HasSuffix(base, ".zip.asc") || strings.HasSuffix(base, ".zip.gpg") {
rbase, err := extractZipFrom(fn)
if err != nil {
return l, errors.Wrap(err, "extractzip")
}
base, err = filepath.Abs(rbase)
if err != nil {
return l, errors.Wrap(err, "basename")
}
}
debug("opening %s", base)
buf, err := readFile(base)
if err != nil {
return l, errors.Wrap(err, "single/readfile")
}
l.files = append(l.files, filepath.Base(base))
return l.ReadFromCSV(buf)
}
func (l *List) AddFromIP(fn string) (*List, error) {
if _, err := os.Stat(fn); err != nil {
return l, errors.Wrapf(err, "unknown fn %s", fn)
}
buf, err := readIPlist(fn)
if err != nil {
return nil, errors.Wrap(err, "addfromip")
}
s := bufio.NewScanner(buf)
for s.Scan() {
l.Add(NewURL(fmt.Sprintf("http://%s/", s.Text())))
}
return l, nil
}
func (l *List) ReadFromCSV(r io.Reader) (*List, error) {
allLines := csvplus.FromReader(r).SelectColumns("type", "value", "to_ids")
rows, err := csvplus.Take(allLines).
Filter(csvplus.Any(csvplus.Like(csvplus.Row{"type": "url"}),
csvplus.Like(csvplus.Row{"type": "filename"}),
csvplus.Like(csvplus.Row{"type": "filename|sha1"}))).
ToRows()
if err != nil {
return l, errors.Wrapf(err, "reading csv")
}
verbose("csv/%d entries found.", len(rows))
for _, row := range rows {
debug("row=%v", row)
rt := strings.Split(row["type"], "|")[0]
debug("rt=%s", rt)
switch rt {
case "filename":
fn := strings.Split(row["value"], "|")[0]
l.Add(NewFilename(fn))
case "url":
// if to_ids is set to 0, do not auto block.
if row["to_ids"] == "1" {
l.Add((NewURL(row["value"])))
}
}
}
return l, nil
}
func (l *List) Files() []string {
return l.files
}
func (l *List) Merge(l1 *List) *List {
for _, e := range l1.s {
l.Add(e)
}
return l
}
// Check1 (now reversed), is the initial implementation with a mutex
func (l *List) Check1(ctx *Context) *Results {
var mut sync.Mutex
r := NewResults()
wg := &sync.WaitGroup{}
queue := make(chan Sourcer, len(l.s))
debug("setup %d workers\n", ctx.jobs)
// Setup workers
for i := 0; i < ctx.jobs; i++ {
wg.Add(1)
go func(n int, wg *sync.WaitGroup) {
defer wg.Done()
debug("%d is fine\n", n)
for e := range queue {
verbose("w%d - %d left", n, len(queue))
if e.Check(ctx.Client) {
verbose("adding %#v\n", e)
mut.Lock()
e.AddTo(r)
mut.Unlock()
}
}
}(i, wg)
}
debug("scan queue:\n")
for _, q := range l.s {
queue <- q
}
close(queue)
wg.Wait()
r.files = l.Files()
debug("r/check=%#v\n", r)
return r
}
// gather results
func res(ins <-chan Sourcer) *Results {
debug("processing results")
r := NewResults()
for e := range ins {
fmt.Print(".")
e.AddTo(r)
}
return r
}
// Check is an alternate version of Check where we still parallelize checks but serialize updating results
// instead of using a mutex.
func (l *List) Check(ctx *Context) *Results {
wg := &sync.WaitGroup{}
// Length for the 2nd one will be tuned
queue := make(chan Sourcer, 50)
ins := make(chan Sourcer, l.Length())
done := make(chan struct{})
defer close(done)
debug("setup done")
// Setup the end of the fan-out
debug("setup %d workers\n", ctx.jobs)
// Setup workers (fan-in)
for i := 0; i < ctx.jobs; i++ {
wg.Add(1)
go func(n int, queue <-chan Sourcer, wg *sync.WaitGroup) {
defer wg.Done()
debug("%d is fine\n", n)
for {
e, ok := <-queue
if !ok {
return
}
debug("w%d - checking %v", n, e)
if e.Check(ctx.Client) {
debug("adding %#v\n", e)
ins <- e
}
}
}(i, queue, wg)
}
var result *Results
// Feed the queue
debug("scan queue:\n")
for _, q := range l.s {
queue <- q
}
go func() {
wg.Wait()
debug("after wait")
close(ins)
}()
debug("closing")
close(queue)
//done <- struct{}{}
debug("after close")
result = res(ins)
result.files = l.Files()
debug("r/check=%#v\n", result)
return result
}