forked from iarv/nntpchan
Compare commits
1196 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
22dc099105 | ||
|
|
723fa5aff5 | ||
|
|
57b6b5050e | ||
|
|
52634b7edd | ||
|
|
412c2ad4ca | ||
|
|
7165f6eb4a | ||
|
|
eed8c07ef6 | ||
|
|
ea91db2f58 | ||
|
|
0cd12cf944 | ||
|
|
eed0fc8001 | ||
|
|
efda3efd56 | ||
|
|
81a08bb407 | ||
|
|
bb890e716b | ||
|
|
1a2c5b9e4a | ||
|
|
358fe300ed | ||
|
|
f4a6988f11 | ||
|
|
f2d854d88f | ||
|
|
4ede62a667 | ||
|
|
59ea3da355 | ||
|
|
2983eb6fbd | ||
|
|
0870b270cc | ||
|
|
f3e76a1e0f | ||
|
|
7d56d68d14 | ||
|
|
7524db96fe | ||
|
|
bd67be0280 | ||
|
|
5be6c9f7e8 | ||
|
|
e78286cc06 | ||
|
|
fea75f7200 | ||
|
|
d61228215e | ||
|
|
cc5d94ee5f | ||
|
|
2152cd3246 | ||
|
|
c6a79b8893 | ||
|
|
838f2b8ca7 | ||
|
|
88d723219a | ||
|
|
dbb5897305 | ||
|
|
892a7ea58b | ||
|
|
64c52e327a | ||
|
|
86b3d3ce62 | ||
|
|
aa3cf130b3 | ||
|
|
ed2f88c0fc | ||
|
|
2d090269c5 | ||
|
|
aa637b7cb6 | ||
|
|
38b24825fd | ||
|
|
bb1b9f427d | ||
|
|
c18152a7ba | ||
|
|
17e89387b5 | ||
|
|
89c5773625 | ||
|
|
1dc800b89c | ||
|
|
c1f9191045 | ||
|
|
bbefe94e8a | ||
|
|
d28f272b94 | ||
|
|
4770129ad6 | ||
|
|
e87005a178 | ||
|
|
1e69493eef | ||
|
|
1a70ff9d92 | ||
|
|
41a8541660 | ||
|
|
f61470468b | ||
|
|
23ae28bc71 | ||
|
|
fa5e250595 | ||
|
|
f079a1fee4 | ||
|
|
5e66346662 | ||
|
|
d48b585fcf | ||
|
|
32e9e4b3eb | ||
|
|
a60ecff7e3 | ||
|
|
54b8b60edd | ||
|
|
2e4c42ff8a | ||
|
|
e9cb9e4f46 | ||
|
|
1753e2e54b | ||
|
|
c2c2146ad3 | ||
|
|
1f1dc6a63b | ||
|
|
f07a6faec6 | ||
|
|
51e0763faf | ||
|
|
5ea8b1b245 | ||
|
|
aecbe2a5a9 | ||
|
|
cff13becaf | ||
|
|
a06a671415 | ||
|
|
70feeed809 | ||
|
|
6af4470473 | ||
|
|
bdabd25867 | ||
|
|
d301021122 | ||
|
|
741ded6694 | ||
|
|
2074e49d75 | ||
|
|
809863c472 | ||
|
|
be54d399f3 | ||
|
|
76a3288d8c | ||
|
|
3d4d106554 | ||
|
|
c7da354244 | ||
|
|
acebb66227 | ||
|
|
3a273ccf08 | ||
|
|
dbc47f8c65 | ||
|
|
c03c8c370e | ||
|
|
a6e5fd13e0 | ||
|
|
37ebcc2693 | ||
|
|
31a1109372 | ||
|
|
d241137ded | ||
|
|
b78f044b0b | ||
|
|
4262f4dc59 | ||
|
|
3629eb41d9 | ||
|
|
d21efc7fd2 | ||
|
|
90652f8e7b | ||
|
|
4469462cb7 | ||
|
|
37598e187d | ||
|
|
e4a9db3f11 | ||
|
|
0965d34fbb | ||
|
|
89c2398a96 | ||
|
|
279faa56b7 | ||
|
|
19d75eb917 | ||
|
|
dba185c6aa | ||
|
|
07e62d2057 | ||
|
|
2f122529b0 | ||
|
|
942294317a | ||
|
|
cfaa96b82c | ||
|
|
cc467ac312 | ||
|
|
0966a247e5 | ||
|
|
4f3ac9f256 | ||
|
|
e9620558ac | ||
|
|
cac9979280 | ||
|
|
fdb6831064 | ||
|
|
fbafc56b4c | ||
|
|
9e291b1c5a | ||
|
|
8d4778c2d7 | ||
|
|
0abb5882ec | ||
|
|
96f51c9862 | ||
|
|
872c5d3757 | ||
|
|
66c1adfece | ||
|
|
66655b18d5 | ||
|
|
0e2c1badcd | ||
|
|
f370a4ccbd | ||
|
|
cff94dc8d8 | ||
|
|
db03367945 | ||
|
|
aca6a0dfa4 | ||
|
|
238ce08337 | ||
|
|
ba113fa90f | ||
|
|
f9e314d949 | ||
|
|
359317457b | ||
|
|
648878235e | ||
|
|
d4ab0ff5d0 | ||
|
|
fff6b502fd | ||
|
|
0cea9f1255 | ||
|
|
bcc2c3fae7 | ||
|
|
04a3bb2c39 | ||
|
|
6beed4053a | ||
|
|
0ef8b3eb2b | ||
|
|
70a63ca296 | ||
|
|
18c9512f5d | ||
|
|
386ccfdcf0 | ||
|
|
72d4fdfdbb | ||
|
|
607ef72af0 | ||
|
|
6554645428 | ||
|
|
23bfe82ca3 | ||
|
|
b1be5f67d3 | ||
|
|
308978914f | ||
|
|
6a37c6ec87 | ||
|
|
9ab0f519a3 | ||
|
|
d10fe80739 | ||
|
|
248dcba2e6 | ||
|
|
e6e2ed4705 | ||
|
|
abdd39bbdf | ||
|
|
22fe5cf4e5 | ||
|
|
baa8d8d5ac | ||
|
|
120357dacd | ||
|
|
0e68b9bc1f | ||
|
|
9703acb04b | ||
|
|
e4b0990375 | ||
|
|
d548c1014e | ||
|
|
c4ccbad74b | ||
|
|
490f8f973a | ||
|
|
a143636d6c | ||
|
|
1da1811d13 | ||
|
|
d084bf6d48 | ||
|
|
e3e086739c | ||
|
|
4a870a8335 | ||
|
|
caf7b14e80 | ||
|
|
ead00a7148 | ||
|
|
b0524645c2 | ||
|
|
304cd79d20 | ||
|
|
3b101236f7 | ||
|
|
b0fd79e415 | ||
|
|
24db116e4e | ||
|
|
787da56d16 | ||
|
|
84e568b753 | ||
|
|
8c9720f6c5 | ||
|
|
40d588f5a4 | ||
|
|
f18ece1f00 | ||
|
|
bf35e678da | ||
|
|
893f1ff9db | ||
|
|
de0f12ebc8 | ||
|
|
484114872c | ||
|
|
157a318175 | ||
|
|
7af1587f33 | ||
|
|
b83b75338c | ||
|
|
eeb57e3ae6 | ||
|
|
4da6a3cdbb | ||
|
|
0a7aae55e6 | ||
|
|
8c5f6e9cde | ||
|
|
d37274ac36 | ||
|
|
87e790570e | ||
|
|
5aad791819 | ||
|
|
00c34b458b | ||
|
|
69c947774d | ||
|
|
ff4336595b | ||
|
|
71121a8421 | ||
|
|
546cf9677d | ||
|
|
e5346917be | ||
|
|
ad3b721134 | ||
|
|
f2e723de4f | ||
|
|
739f2c2291 | ||
|
|
066c514bf0 | ||
|
|
0f05488466 | ||
|
|
f35d7b29e0 | ||
|
|
efcd18bc8a | ||
|
|
881ca6cdf0 | ||
|
|
7c6bb5c40d | ||
|
|
e9e46e1f59 | ||
|
|
c965f0f7af | ||
|
|
e02f0fc3fd | ||
|
|
48cc9a6b6b | ||
|
|
fc64ea0acf | ||
|
|
7e728a4a0a | ||
|
|
77d87c0856 | ||
|
|
c871e6ccd3 | ||
|
|
28a30bdd3d | ||
|
|
a66d31f447 | ||
|
|
f482c8972e | ||
|
|
8b5952f66b | ||
|
|
fa66537f9e | ||
|
|
08aaac492e | ||
|
|
665849e016 | ||
|
|
e87d739392 | ||
|
|
e8fa40c0ca | ||
|
|
279ca91043 | ||
|
|
af7205e8fe | ||
|
|
ce7170c438 | ||
|
|
9c60901332 | ||
|
|
f0b3de1c6e | ||
|
|
3a6cbf9de6 | ||
|
|
eb0ef957a4 | ||
|
|
665c52fbf6 | ||
|
|
5f8aa9f993 | ||
|
|
5a13dc4816 | ||
|
|
ddb07b482b | ||
|
|
9841bd74e3 | ||
|
|
f35def74c3 | ||
|
|
297848c8c3 | ||
|
|
e0c35620b0 | ||
|
|
5575bd2ddc | ||
|
|
35bc32d3b1 | ||
|
|
1dbcd224ad | ||
|
|
6247d0cfff | ||
|
|
bff7dadaa1 | ||
|
|
ccaa23c9d8 | ||
|
|
6ebb563fbb | ||
|
|
d70639dcb6 | ||
|
|
05ef278693 | ||
|
|
20f442f8f2 | ||
|
|
026c5039a9 | ||
|
|
f83b4340c6 | ||
|
|
674d7fecb2 | ||
|
|
e6f6d4ef37 | ||
|
|
eb369ca538 | ||
|
|
ccefab982f | ||
|
|
e800f9cfd0 | ||
|
|
ac88b2e083 | ||
|
|
7749fb9ced | ||
|
|
2a6ee9bc23 | ||
|
|
cbea6e011e | ||
|
|
94632b37c9 | ||
|
|
21008c857a | ||
|
|
8521d0d490 | ||
|
|
9e47a4f2c8 | ||
|
|
7d556b0615 | ||
|
|
c5fa3ad4a2 | ||
|
|
7c8129c42e | ||
|
|
4411538252 | ||
|
|
5ab54ae654 | ||
|
|
f0790204c0 | ||
|
|
c331570e37 | ||
|
|
7ba642df36 | ||
|
|
b29446bd9d | ||
|
|
836d1212cc | ||
|
|
461721d729 | ||
|
|
810c4f52fe | ||
|
|
b0c4dd5f66 | ||
|
|
4c6cfefdb5 | ||
|
|
3d195510ba | ||
|
|
6e5c34ebdd | ||
|
|
749e1fc069 | ||
|
|
3f6c6ed615 | ||
|
|
af6c0ba6b8 | ||
|
|
f8acfaaae4 | ||
|
|
da43536e6c | ||
|
|
f4ee1d3e0b | ||
|
|
c7be368be9 | ||
|
|
3cb06d572e | ||
|
|
f94ecbdaa9 | ||
|
|
f1f9ae33d9 | ||
|
|
008cfb6db5 | ||
|
|
46e8f48f66 | ||
|
|
855c78a8f8 | ||
|
|
9ec1c5c304 | ||
|
|
0ab6dca181 | ||
|
|
1d20cb3142 | ||
|
|
baf6e29473 | ||
|
|
1346eb56ab | ||
|
|
a8ac1dd67c | ||
|
|
0e51b675c2 | ||
|
|
2fd58bebbb | ||
|
|
f44430e3ca | ||
|
|
e705bbccba | ||
|
|
a3ed5a9d91 | ||
|
|
2012e6d3a8 | ||
|
|
90bf96a025 | ||
|
|
da9e0d5808 | ||
|
|
99ebddc7c4 | ||
|
|
baeabad1a4 | ||
|
|
13724b751a | ||
|
|
cba3c29328 | ||
|
|
0e1e614696 | ||
|
|
178b7e56f6 | ||
|
|
0feb319236 | ||
|
|
4c927ff74a | ||
|
|
a5f3188cce | ||
|
|
7cf55931b7 | ||
|
|
1174df8344 | ||
|
|
b41f1bebc8 | ||
|
|
ccb750679a | ||
|
|
5b4bcd7cd9 | ||
|
|
a729848963 | ||
|
|
5727543e28 | ||
|
|
e2f509641a | ||
|
|
d000fcc993 | ||
|
|
52d401270f | ||
|
|
4d2d62681b | ||
|
|
3c61aad46c | ||
|
|
718863a2fc | ||
|
|
4d954861aa | ||
|
|
aafe3ad2a8 | ||
|
|
0c15c22ca2 | ||
|
|
ebf3f578b0 | ||
|
|
c8146eb783 | ||
|
|
1b18fc89a2 | ||
|
|
cfa83a7db8 | ||
|
|
8d6bd12346 | ||
|
|
898bc668d9 | ||
|
|
171d3e75f4 | ||
|
|
f04627ff4f | ||
|
|
c1c2ed2dda | ||
|
|
0fb9f392d7 | ||
|
|
7ac7399dcf | ||
|
|
2885ebee81 | ||
|
|
ba5801f920 | ||
|
|
b65e0cdfba | ||
|
|
172b1e7c8c | ||
|
|
0e8d277482 | ||
|
|
4be8c78aa7 | ||
|
|
3e178c63eb | ||
|
|
5cc2b1b937 | ||
|
|
997fad55e4 | ||
|
|
95b4dd7c91 | ||
|
|
4305692727 | ||
|
|
4665c0eb4e | ||
|
|
2aac424dc2 | ||
|
|
e2d7846d45 | ||
|
|
b42a2ae138 | ||
|
|
91476b700c | ||
|
|
13f8a0ab13 | ||
|
|
1467979dab | ||
|
|
dfdf4043f1 | ||
|
|
ba42a523ff | ||
|
|
49ef756672 | ||
|
|
a97c3d7d48 | ||
|
|
ad3089728a | ||
|
|
bfd16332f1 | ||
|
|
9cf7e617cb | ||
|
|
12f8ee9131 | ||
|
|
eabe6474de | ||
|
|
75dc4c2529 | ||
|
|
11b5ca6a1b | ||
|
|
8c2ddda51a | ||
|
|
963637e750 | ||
|
|
ff8bdcf08c | ||
|
|
6af49f6800 | ||
|
|
f0a9a67c29 | ||
|
|
612c9c8989 | ||
|
|
026eaa2f84 | ||
|
|
f229ea555c | ||
|
|
aa29679a92 | ||
|
|
97eec6053d | ||
|
|
64a78a4131 | ||
|
|
c8ca9dd855 | ||
|
|
caddb84dfb | ||
|
|
f9d4d30941 | ||
|
|
a09f1cd454 | ||
|
|
36c0bc127f | ||
|
|
a36e523ddf | ||
|
|
992dfad0dc | ||
|
|
19452704fc | ||
|
|
953042578b | ||
|
|
01813b2877 | ||
|
|
7096ea4e52 | ||
|
|
9e14d6ce30 | ||
|
|
60d226c66b | ||
|
|
fc2c582627 | ||
|
|
0eac006d52 | ||
|
|
228af0c5f4 | ||
|
|
0f60daf299 | ||
|
|
1ec4663499 | ||
|
|
0e394ae25e | ||
|
|
e818547661 | ||
|
|
7e2d9f2d0f | ||
|
|
25ae491ddc | ||
|
|
5ef0085b57 | ||
|
|
536b1161c9 | ||
|
|
e35adda727 | ||
|
|
ccbb348155 | ||
|
|
1e81129090 | ||
|
|
cbad613621 | ||
|
|
0d5fded584 | ||
|
|
595a258331 | ||
|
|
d4305eb2f0 | ||
|
|
34559db9aa | ||
|
|
f275ceaec1 | ||
|
|
0854260d43 | ||
|
|
6f8862b631 | ||
|
|
69c20952ad | ||
|
|
ada1a614ea | ||
|
|
b0ede42c61 | ||
|
|
c9f5cf183c | ||
|
|
e9e94b17d5 | ||
|
|
23390b5998 | ||
|
|
8f9622dca8 | ||
|
|
579970c079 | ||
|
|
000fb43159 | ||
|
|
78e7895c70 | ||
|
|
82a0746d3e | ||
|
|
b5580bebdd | ||
|
|
e672f412dc | ||
|
|
bdf11b535c | ||
|
|
2468083ba2 | ||
|
|
a00a902022 | ||
|
|
1465b99df6 | ||
|
|
38354318b8 | ||
|
|
f319d8e809 | ||
|
|
a86345aa8b | ||
|
|
fc1e20bd6f | ||
|
|
2b811a6b34 | ||
|
|
f5520a7127 | ||
|
|
a93f3201f9 | ||
|
|
c0ae3d0756 | ||
|
|
91406d3400 | ||
|
|
8dd77dcdf0 | ||
|
|
3ab022f45d | ||
|
|
c677cebde5 | ||
|
|
6f01bac76c | ||
|
|
c0e216a390 | ||
|
|
2527e695dd | ||
|
|
fdedd6a6c0 | ||
|
|
59c52f775f | ||
|
|
c8cb42edfd | ||
|
|
4ad781e541 | ||
|
|
4f0c2e2f18 | ||
|
|
6065eca82f | ||
|
|
3983506fe3 | ||
|
|
4ea96b155f | ||
|
|
3429ac63f8 | ||
|
|
2ae4f2268b | ||
|
|
801272ae7d | ||
|
|
d1a81f319d | ||
|
|
9f7de85a1f | ||
|
|
518a32016b | ||
|
|
e036db805e | ||
|
|
56b90bf5f7 | ||
|
|
6cdcc4c3b9 | ||
|
|
487495f9ac | ||
|
|
15bc796952 | ||
|
|
774b2a5e50 | ||
|
|
78dccbfd61 | ||
|
|
6eefd675e6 | ||
|
|
3fed1d8d41 | ||
|
|
7a4c875fd5 | ||
|
|
f315823dcd | ||
|
|
64a9e471ef | ||
|
|
670f613596 | ||
|
|
84092c979f | ||
|
|
3fad9794da | ||
|
|
ecf8237c97 | ||
|
|
c3224379ca | ||
|
|
2a744c45a2 | ||
|
|
64b345a7f0 | ||
|
|
f25f2cd956 | ||
|
|
14c68abf9d | ||
|
|
3c2da5f25b | ||
|
|
dafa5ca517 | ||
|
|
d81e709827 | ||
|
|
4c7dd44815 | ||
|
|
514064ce5a | ||
|
|
dac258a978 | ||
|
|
a9860d82ba | ||
|
|
cc957f3de5 | ||
|
|
8665b98452 | ||
|
|
31a12185f6 | ||
|
|
e686f0d57e | ||
|
|
8ffc8c006c | ||
|
|
a19d36f883 | ||
|
|
3aa87e07f2 | ||
|
|
be4fbda2a6 | ||
|
|
7f25dcf95c | ||
|
|
a7e33a9f10 | ||
|
|
2c49987c6d | ||
|
|
00fa6eb561 | ||
|
|
9d18d59f45 | ||
|
|
f47b181290 | ||
|
|
6d7f2bd587 | ||
|
|
3bc2befb88 | ||
|
|
239ba55f1f | ||
|
|
349c588bdd | ||
|
|
4bd8f0a688 | ||
|
|
6b3fc260a6 | ||
|
|
975693d241 | ||
|
|
6b934ebd52 | ||
|
|
95ab7448be | ||
|
|
1acad1b11f | ||
|
|
4d91cbd084 | ||
|
|
89d20a1617 | ||
|
|
20120a8690 | ||
|
|
864a751130 | ||
|
|
e668cdc16e | ||
|
|
f76ba6422c | ||
|
|
9a6400e15b | ||
|
|
a068fe634d | ||
|
|
a5da6d2e78 | ||
|
|
e32f60e658 | ||
|
|
21b5a21008 | ||
|
|
4ada177ae9 | ||
|
|
176c162781 | ||
|
|
d77b2dbff9 | ||
|
|
6bb2b154ef | ||
|
|
83cc63fc06 | ||
|
|
89a004e8ec | ||
|
|
b393c066b0 | ||
|
|
2eecfeafaa | ||
|
|
25a15100a9 | ||
|
|
aeab87cb51 | ||
|
|
458a1c04d9 | ||
|
|
af4baa42a4 | ||
|
|
d64be9150d | ||
|
|
4be03b0b96 | ||
|
|
b34b58a0cf | ||
|
|
d52c65828f | ||
|
|
26a21fe6bf | ||
|
|
030460e2c4 | ||
|
|
84cdf459ae | ||
|
|
190321b4c4 | ||
|
|
37119a249e | ||
|
|
2caf487c72 | ||
|
|
aecb4b6ac0 | ||
|
|
554d2d753e | ||
|
|
13739363f4 | ||
|
|
00fdbb9449 | ||
|
|
4369765253 | ||
|
|
9883ed4396 | ||
|
|
ba7140053a | ||
|
|
2727fe9dff | ||
|
|
e080e939dd | ||
|
|
4b1da71030 | ||
|
|
2aa79bd014 | ||
|
|
de5883d0a0 | ||
|
|
ce3919fc1f | ||
|
|
561a0156be | ||
|
|
fde7ed3d3b | ||
|
|
3c4ad2fe50 | ||
|
|
cd803852e7 | ||
|
|
2e2968e188 | ||
|
|
4f3bc5cf6e | ||
|
|
378a257377 | ||
|
|
04df5de9a1 | ||
|
|
9ae0b0ef5b | ||
|
|
d31ca5b6a7 | ||
|
|
cc089b3401 | ||
|
|
7b8d33826b | ||
|
|
9e9a1efe06 | ||
|
|
a5d7cb9074 | ||
|
|
053b5870cf | ||
|
|
4ab90f3152 | ||
|
|
dc75a3513e | ||
|
|
40ceb747ae | ||
|
|
6996e3abc4 | ||
|
|
5118ffb3f8 | ||
|
|
287a49f196 | ||
|
|
698ed1d42e | ||
|
|
a0deb532e3 | ||
|
|
0e1e6201ca | ||
|
|
6ea75236fa | ||
|
|
61281190bb | ||
|
|
2355528b46 | ||
|
|
db5b8ec309 | ||
|
|
a0a0a6feca | ||
|
|
787bef7625 | ||
|
|
e57d4ea921 | ||
|
|
c6c9c3f53b | ||
|
|
f7eb634aa1 | ||
|
|
74f07c3a6c | ||
|
|
95864559fb | ||
|
|
5155205e8c | ||
|
|
d91b0d3e99 | ||
|
|
3df355abdb | ||
|
|
850e5bccae | ||
|
|
713fe21190 | ||
|
|
3d683ab87e | ||
|
|
a4053f0f1a | ||
|
|
87e29cc117 | ||
|
|
c17d0fb0bb | ||
|
|
985863deb2 | ||
|
|
a9d2c0425d | ||
|
|
76cb2341ce | ||
|
|
ceb6f09a3f | ||
|
|
adf3540556 | ||
|
|
2ce8a38b0b | ||
|
|
e62d959b0b | ||
|
|
4216a777a3 | ||
|
|
5873b41e00 | ||
|
|
14635e9472 | ||
|
|
422f3de11d | ||
|
|
64b5531fed | ||
|
|
17f3b25e51 | ||
|
|
60f0c19a9f | ||
|
|
f4f2479b8a | ||
|
|
3506d7f975 | ||
|
|
9acca366d0 | ||
|
|
70fd791545 | ||
|
|
9f3c41fb0b | ||
|
|
2ff6088605 | ||
|
|
54644e0da2 | ||
|
|
dbd05c30c3 | ||
|
|
587cdf4e75 | ||
|
|
76d75b260f | ||
|
|
35ff3759f4 | ||
|
|
671db6e483 | ||
|
|
32566bfd84 | ||
|
|
4b02ad6d89 | ||
|
|
a5c2f8d86f | ||
|
|
6e1e7440dc | ||
|
|
0b460eeb5d | ||
|
|
2a32bb75d5 | ||
|
|
cf91d8ffa5 | ||
|
|
375713390e | ||
|
|
f823b0e612 | ||
|
|
cb1821189a | ||
|
|
1a5862213c | ||
|
|
96c019324d | ||
|
|
1e905b6bbf | ||
|
|
7c6726b5fc | ||
|
|
24d18ff599 | ||
|
|
16d0489cd7 | ||
|
|
5875347966 | ||
|
|
b2c1d9eb26 | ||
|
|
a0bc39aaa5 | ||
|
|
b887d07172 | ||
|
|
1f48c58f6b | ||
|
|
e8eec5862f | ||
|
|
bf7213bf09 | ||
|
|
b2201c4ef7 | ||
|
|
a4747b9965 | ||
|
|
5ec4c823fe | ||
|
|
00d0be952f | ||
|
|
c448777fe9 | ||
|
|
30b54c17fa | ||
|
|
e954c57da6 | ||
|
|
d5d30893e5 | ||
|
|
72947dbbcc | ||
|
|
1c632666ab | ||
|
|
5cf12f37a5 | ||
|
|
9c038021b5 | ||
|
|
4a8861761d | ||
|
|
13e0010419 | ||
|
|
e461462bd6 | ||
|
|
8101e67b10 | ||
|
|
63edd14243 | ||
|
|
d2142f7c83 | ||
|
|
28b1864841 | ||
|
|
5fa1e76971 | ||
|
|
40eeb116de | ||
|
|
a502259ba9 | ||
|
|
cac18a5e44 | ||
|
|
c86f573440 | ||
|
|
6f5130d8fd | ||
|
|
17b8101349 | ||
|
|
5e53ae6f04 | ||
|
|
50c395aad4 | ||
|
|
18bf12e556 | ||
|
|
bc1c038468 | ||
|
|
7117a25f9a | ||
|
|
ef69bda0d7 | ||
|
|
ab6ac43851 | ||
|
|
28feb5a84e | ||
|
|
9e3e0cc443 | ||
|
|
c573fb646b | ||
|
|
93b3e0f83f | ||
|
|
7dda235ab1 | ||
|
|
09e7969479 | ||
|
|
cb37a45b67 | ||
|
|
e25d6ab370 | ||
|
|
e2194d3fbd | ||
|
|
fdc4234d08 | ||
|
|
0c0160da6d | ||
|
|
fd82218e5f | ||
|
|
091d74af52 | ||
|
|
e690b7dd9c | ||
|
|
a856af693f | ||
|
|
3668eb7822 | ||
|
|
3cc04a6cad | ||
|
|
e6967a75e7 | ||
|
|
679ee50342 | ||
|
|
b73c219e6b | ||
|
|
1b474af875 | ||
|
|
77a72c5770 | ||
|
|
a52fe21743 | ||
|
|
42c70990a0 | ||
|
|
0980903b6e | ||
|
|
47737dd205 | ||
|
|
a22330f920 | ||
|
|
05b4695398 | ||
|
|
415fb3c4a8 | ||
|
|
5138c31e58 | ||
|
|
052259c9d1 | ||
|
|
7276e28bb7 | ||
|
|
2adf2d5127 | ||
|
|
242094193f | ||
|
|
2ffc7a80e6 | ||
|
|
3da1ab157d | ||
|
|
17d2654f26 | ||
|
|
f155b0e9a1 | ||
|
|
c97296700f | ||
|
|
3951432bad | ||
|
|
da5c44d4fd | ||
|
|
a35889ca18 | ||
|
|
c171e62d52 | ||
|
|
75a3cf5ede | ||
|
|
2d25b349f7 | ||
|
|
29149eb452 | ||
|
|
57232aeaf0 | ||
|
|
2ced2b73c7 | ||
|
|
0dce01cd6d | ||
|
|
5d05f62db5 | ||
|
|
fe9de25dcd | ||
|
|
2c2bfce762 | ||
|
|
68bc36c0db | ||
|
|
5c353e94f0 | ||
|
|
d1d2ade366 | ||
|
|
a007f314e8 | ||
|
|
9728cf697b | ||
|
|
67cd4ab112 | ||
|
|
435bfa17d5 | ||
|
|
b9373e44a1 | ||
|
|
00153e3957 | ||
|
|
588e19e93c | ||
|
|
e9592b6021 | ||
|
|
42ef4c4df1 | ||
|
|
dbb119bd8b | ||
|
|
9e3e597088 | ||
|
|
e50099b7c0 | ||
|
|
55baec7af7 | ||
|
|
4ab24625fa | ||
|
|
1eed2cdd1a | ||
|
|
43a81a6a4d | ||
|
|
43dcbad33c | ||
|
|
89b51773eb | ||
|
|
47b722a825 | ||
|
|
76b6bad8a5 | ||
|
|
648b66cbbe | ||
|
|
1f2c644bf6 | ||
|
|
8aed629be6 | ||
|
|
9042f0f3b0 | ||
|
|
a425ffea8f | ||
|
|
a4a4eb7c2a | ||
|
|
a01d5b0cee | ||
|
|
9f8ce5ab95 | ||
|
|
880d1e10e3 | ||
|
|
ff745ada70 | ||
|
|
68d7ec783d | ||
|
|
a17f91fea1 | ||
|
|
c5cf5ba4f9 | ||
|
|
9f9bebf99c | ||
|
|
6ea1b2d3b4 | ||
|
|
acc727b901 | ||
|
|
594cc4929a | ||
|
|
e0f15b73fb | ||
|
|
0ac0d7d1ff | ||
|
|
9a6a4247ce | ||
|
|
22e384f2d1 | ||
|
|
7c668c5184 | ||
|
|
91b6dbe9b2 | ||
|
|
21566eb0d9 | ||
|
|
cc382572c6 | ||
|
|
6e029cea0d | ||
|
|
c92b78c754 | ||
|
|
32eae178fb | ||
|
|
8a1936fade | ||
|
|
edd44c73bf | ||
|
|
b3d346c61f | ||
|
|
ef124fe7f2 | ||
|
|
38f9db2f57 | ||
|
|
e45c172e62 | ||
|
|
705f3b9df0 | ||
|
|
1f4e6c8ecb | ||
|
|
0831c250c4 | ||
|
|
ecb462c0c3 | ||
|
|
6092f4e78e | ||
|
|
316729774a | ||
|
|
c4f8fd118d | ||
|
|
543108e0d6 | ||
|
|
6631b881b0 | ||
|
|
2d39c33f05 | ||
|
|
b32ff7b6ac | ||
|
|
9583b80ac5 | ||
|
|
71b46ef1f2 | ||
|
|
5f0a353482 | ||
|
|
6eb84bf55e | ||
|
|
e057ee1812 | ||
|
|
279e9c18c9 | ||
|
|
191dbc860c | ||
|
|
a9403410c8 | ||
|
|
6e2f245f24 | ||
|
|
6d20a991f8 | ||
|
|
d20de6b9b5 | ||
|
|
fbb14cc719 | ||
|
|
6bb1f4978e | ||
|
|
40d372efe3 | ||
|
|
51672e81c3 | ||
|
|
5b06abe63d | ||
|
|
8ebe2d2d26 | ||
|
|
b020d13304 | ||
|
|
aa9ae3d32f | ||
|
|
53046ad1d2 | ||
|
|
a851eddccf | ||
|
|
a2c33bc649 | ||
|
|
e868b2c73b | ||
|
|
4de2b15959 | ||
|
|
a57a3b283c | ||
|
|
b9efd55a57 | ||
|
|
87097b7a06 | ||
|
|
c50aecc34d | ||
|
|
74e0d479a6 | ||
|
|
4420a65dfd | ||
|
|
b73ad00865 | ||
|
|
945e609dff | ||
|
|
2c63c3d0ad | ||
|
|
c86d58a44b | ||
|
|
12ae47b9b6 | ||
|
|
27e19f3591 | ||
|
|
50a8ddd458 | ||
|
|
5690e80758 | ||
|
|
489b21fd04 | ||
|
|
f9b08aa467 | ||
|
|
85938d1f6b | ||
|
|
a1d02708fa | ||
|
|
f3f051fbf1 | ||
|
|
d078e58774 | ||
|
|
d8ecf670d5 | ||
|
|
1bd84c839e | ||
|
|
5bfa14ba1a | ||
|
|
7d258d9f3b | ||
|
|
57d8fd4841 | ||
|
|
a8653a472e | ||
|
|
45c0cf142d | ||
|
|
f53d9b8a5b | ||
|
|
42ea131dff | ||
|
|
57ca993189 | ||
|
|
9d4b43c7e9 | ||
|
|
8802d5feef | ||
|
|
b8d58ab3e3 | ||
|
|
00e2e4d03d | ||
|
|
9ed02e4df0 | ||
|
|
59a8e244a0 | ||
|
|
3bd9e85682 | ||
|
|
3749445531 | ||
|
|
5337fea89f | ||
|
|
77e1f16624 | ||
|
|
28b8c5059c | ||
|
|
285f5c271a | ||
|
|
e143a78e20 | ||
|
|
b9905ebae4 | ||
|
|
89dee3b72d | ||
|
|
18ea50ab18 | ||
|
|
1fb23dd34a | ||
|
|
6ce938b86a | ||
|
|
a853409230 | ||
|
|
cfeb11b545 | ||
|
|
963b893e39 | ||
|
|
a75c22aecb | ||
|
|
ca2d87e303 | ||
|
|
bf143f07f7 | ||
|
|
850e61d923 | ||
|
|
c5937bc3f7 | ||
|
|
4436c62fe2 | ||
|
|
71bb46cb5b | ||
|
|
f06daf111a | ||
|
|
93434f3bf6 | ||
|
|
90aaad39bf | ||
|
|
8492cc35fa | ||
|
|
5087a0de7a | ||
|
|
dfe6eae59f | ||
|
|
030a9e58e8 | ||
|
|
7a73cf3d55 | ||
|
|
8e1eb8620c | ||
|
|
546f4d413f | ||
|
|
aa04d1d3ba | ||
|
|
27eae6750c | ||
|
|
3174aaad22 | ||
|
|
89c4fe4a96 | ||
|
|
4f204fd873 | ||
|
|
7612b629ad | ||
|
|
0d5b0ddb0b | ||
|
|
b41d2fa532 | ||
|
|
52239bebc3 | ||
|
|
a7a97709fe | ||
|
|
e0789c8f90 | ||
|
|
c5e90ec550 | ||
|
|
6840c28cb8 | ||
|
|
41caf046a0 | ||
|
|
deb5a36c0d | ||
|
|
920ddb64b3 | ||
|
|
af59a38a40 | ||
|
|
8bca301e55 | ||
|
|
8401c5a25d | ||
|
|
ab44cb2457 | ||
|
|
e831a56809 | ||
|
|
84cac4ceec | ||
|
|
e372893373 | ||
|
|
4f0ae8fec3 | ||
|
|
7f445f81fc | ||
|
|
28c18afaf9 | ||
|
|
6008c94949 | ||
|
|
8dc1218934 | ||
|
|
11204cba16 | ||
|
|
e3928bc6c2 | ||
|
|
c2bd325be6 | ||
|
|
941c4a3a9f | ||
|
|
261493af0b | ||
|
|
1791fc475b | ||
|
|
de7cec2c43 | ||
|
|
e7c90c647d | ||
|
|
9596c1e27e | ||
|
|
c86732ba5c | ||
|
|
2a7c15241f | ||
|
|
d2d81ccbd0 | ||
|
|
78a5138409 | ||
|
|
bdd9ae9ae4 | ||
|
|
a8a98b03fb | ||
|
|
4a5fd4aba0 | ||
|
|
2de7c633d4 | ||
|
|
56c72d1d74 | ||
|
|
f3793852a2 | ||
|
|
382875509b | ||
|
|
5da696d1c8 | ||
|
|
7f1800a0c6 | ||
|
|
504c9ae84e | ||
|
|
63a3511c84 | ||
|
|
309d8e6c45 | ||
|
|
403c404ced | ||
|
|
133b032f1d | ||
|
|
ac0b171f19 | ||
|
|
0e57fe057f | ||
|
|
6e4398f0c2 | ||
|
|
136a0878af | ||
|
|
813c00e3ea | ||
|
|
d8625a1cb5 | ||
|
|
c7d322c09d | ||
|
|
f7e8359f7b | ||
|
|
3283e53c5c | ||
|
|
fb2b80335e | ||
|
|
96f6044489 | ||
|
|
8f1a497f13 | ||
|
|
272fe26b26 | ||
|
|
dec1a3e78d | ||
|
|
85ce14091a | ||
|
|
faf5071740 | ||
|
|
aadf8a9bfa | ||
|
|
6ccb829fb9 | ||
|
|
3be1c3e081 | ||
|
|
3e20e100f5 | ||
|
|
f227786e33 | ||
|
|
82d71588e9 | ||
|
|
521c135498 | ||
|
|
ae45d3e516 | ||
|
|
363bf49799 | ||
|
|
8782dffeae | ||
|
|
da4e56fe25 | ||
|
|
eb9a8e5174 | ||
|
|
bd45322509 | ||
|
|
2705a111c6 | ||
|
|
bb748f9a74 | ||
|
|
1ef0430392 | ||
|
|
2415c10029 | ||
|
|
f6f84f25c8 | ||
|
|
23c4f455d5 | ||
|
|
b1ebd3826a | ||
|
|
914c69215e | ||
|
|
fdb34a7816 | ||
|
|
21b80ecc8d | ||
|
|
d0d1bed10a | ||
|
|
2613c57bf8 | ||
|
|
43bb6e4c5c | ||
|
|
7136b176ee | ||
|
|
7767b6d436 | ||
|
|
98b2834bd1 | ||
|
|
d1f540f99a | ||
|
|
7bdb104fcf | ||
|
|
9e68e626c9 | ||
|
|
7df2e6c83b | ||
|
|
9aca55ec71 | ||
|
|
9f55486107 | ||
|
|
4e161a5d70 | ||
|
|
ee3b067555 | ||
|
|
64c5b1589b | ||
|
|
7b3a6329a6 | ||
|
|
fab83592b7 | ||
|
|
7b8d229b64 | ||
|
|
b2d0bfea8c | ||
|
|
9ce09c34c3 | ||
|
|
fdd9bab210 | ||
|
|
ee73b907de | ||
|
|
27192b0248 | ||
|
|
45267caa0a | ||
|
|
f6576aa899 | ||
|
|
ce8180c804 | ||
|
|
5375252783 | ||
|
|
cc5806a035 | ||
|
|
1fa694282b | ||
|
|
f94491e38d | ||
|
|
df4b263f39 | ||
|
|
3fb94baaca | ||
|
|
be7831cd10 | ||
|
|
7daa0f8520 | ||
|
|
7afd47805a | ||
|
|
def0a4a5c5 | ||
|
|
3fdda45425 | ||
|
|
56a345949d | ||
|
|
2a08f73db4 | ||
|
|
52bafb364d | ||
|
|
a4c70fe77b | ||
|
|
58d32b5d1d | ||
|
|
a389c8b82d | ||
|
|
c8e8ab95cd | ||
|
|
331fed1731 | ||
|
|
5bcbe255b1 | ||
|
|
ba045b6903 | ||
|
|
187eef590d | ||
|
|
06ff6554d4 | ||
|
|
d217776201 | ||
|
|
76949151de | ||
|
|
a6f418d3a9 | ||
|
|
fa27cc64ef | ||
|
|
e042d0fef7 | ||
|
|
2eefe2e301 | ||
|
|
b1c1e4fab3 | ||
|
|
68a83205ab | ||
|
|
950441ef45 | ||
|
|
e01002ed25 | ||
|
|
9d7eceb927 | ||
|
|
2b28431568 | ||
|
|
0df3fe43e0 | ||
|
|
1a3fe3af66 | ||
|
|
6d6ba47b2c | ||
|
|
d47d390536 | ||
|
|
157d1f8cb9 | ||
|
|
5df2ecac0c | ||
|
|
1452be84bf | ||
|
|
d5d005e74b | ||
|
|
846fe26ec5 | ||
|
|
940ac4dec0 | ||
|
|
3a26c3e38e | ||
|
|
0a4a3b4f8a | ||
|
|
11f096e195 | ||
|
|
02330805e9 | ||
|
|
ed5be31c22 | ||
|
|
d99a222434 | ||
|
|
01bd911084 | ||
|
|
79ae266424 | ||
|
|
e9db85c5b6 | ||
|
|
d82f2e3732 | ||
|
|
2d9aac039c | ||
|
|
917b15156c | ||
|
|
b03b18b05f | ||
|
|
7527e4c978 | ||
|
|
702dcf7997 | ||
|
|
5cd2c3d43a | ||
|
|
3e4d128b9c | ||
|
|
ecb223ebc4 | ||
|
|
61e390daf0 | ||
|
|
4264004eaf | ||
|
|
ac4eb96a69 | ||
|
|
d59cb4f9a8 | ||
|
|
ad1ff687f6 | ||
|
|
480c40ce4f | ||
|
|
a1142aa670 | ||
|
|
6fddac0245 | ||
|
|
531da63e7b | ||
|
|
d52a63586f | ||
|
|
3710ed884e | ||
|
|
9019bf2e9a | ||
|
|
de6d2964f9 | ||
|
|
12f5e67bb4 | ||
|
|
b71d62ca35 | ||
|
|
fffe030fa2 | ||
|
|
74099cb5f2 | ||
|
|
d55716dc9b | ||
|
|
dabbf4d143 | ||
|
|
048300d6e4 | ||
|
|
3a1a24f6da | ||
|
|
5fccdeba45 | ||
|
|
72e10a8734 | ||
|
|
b78054a751 | ||
|
|
c394114c4e | ||
|
|
7aa6eb28b2 | ||
|
|
a96b4d0585 | ||
|
|
c8217dad84 | ||
|
|
926aa0b69f | ||
|
|
a51f9a77e6 | ||
|
|
f0fd23e6a9 | ||
|
|
85dc5da83a | ||
|
|
1b7526ff2f | ||
|
|
982cbf2eb1 | ||
|
|
c455edcd59 | ||
|
|
ed489f9d89 | ||
|
|
07d6bc2cd7 | ||
|
|
cdcd0ce68d | ||
|
|
861acbbe0a | ||
|
|
7e47470cea | ||
|
|
d1bf4cc7f3 | ||
|
|
e2968dbd97 | ||
|
|
ed62c4e879 | ||
|
|
a02c6f040e | ||
|
|
7022dbf8c1 | ||
|
|
14cf2cbe5b | ||
|
|
6a73f5d727 | ||
|
|
5a069dbb9a | ||
|
|
77be791ce7 | ||
|
|
d69ee3a8d0 | ||
|
|
115e2884c1 | ||
|
|
f9ab15e271 | ||
|
|
6c5aed6a3c | ||
|
|
cc0a0bc269 | ||
|
|
fe2fb50775 | ||
|
|
a423b6bfe6 | ||
|
|
7441463de3 | ||
|
|
2dea0917d1 | ||
|
|
d059971dcc | ||
|
|
fd60d92728 | ||
|
|
4737932a3e | ||
|
|
32c5df4ffd | ||
|
|
dede4299dc | ||
|
|
57afa2ce4b | ||
|
|
4a79b1c998 | ||
|
|
5443e06b38 | ||
|
|
69f08dbb58 | ||
|
|
9f5409a66a | ||
|
|
6ff21ebaeb | ||
|
|
14fe9fe916 | ||
|
|
5c66f4684a | ||
|
|
6797e68ddd | ||
|
|
86088b52e8 | ||
|
|
b44c711483 | ||
|
|
d38ff65c22 | ||
|
|
02cafc2cc5 | ||
|
|
d956f5334c | ||
|
|
3799c8caa1 | ||
|
|
bcb12ecb0f | ||
|
|
b89ca0dc72 | ||
|
|
893491ce25 | ||
|
|
51d031566a | ||
|
|
a54b928a67 | ||
|
|
8ac1c210f2 | ||
|
|
8d83e4dbaf | ||
|
|
d4a200e921 | ||
|
|
e1f9efffbc | ||
|
|
61de708062 | ||
|
|
411230f48a | ||
|
|
5530ae113e | ||
|
|
29b2db8198 | ||
|
|
bc239360ea | ||
|
|
558553a587 | ||
|
|
23752f0996 | ||
|
|
317bbbf457 | ||
|
|
177082fded | ||
|
|
323f2f150c | ||
|
|
44ff1d2fb6 | ||
|
|
390574ed45 | ||
|
|
60dec3db4a | ||
|
|
00a69ad685 | ||
|
|
2959be4564 | ||
|
|
5d14475373 | ||
|
|
62e59d4201 | ||
|
|
af02424d20 | ||
|
|
33c6c33af2 | ||
|
|
7a67e38bf1 |
11
.gitignore
vendored
11
.gitignore
vendored
@@ -19,7 +19,7 @@ webroot
|
||||
|
||||
# built binaries
|
||||
go
|
||||
srndv2
|
||||
./srndv2
|
||||
|
||||
# private key
|
||||
*.key
|
||||
@@ -29,3 +29,12 @@ certs
|
||||
|
||||
|
||||
rebuild.sh
|
||||
.gx
|
||||
|
||||
# generated js
|
||||
contrib/static/nntpchan.js
|
||||
contrib/static/js/nntpchan.js
|
||||
contrib/static/miner-js.js
|
||||
|
||||
#docs trash
|
||||
doc/.trash
|
||||
|
||||
2
LICENSE
2
LICENSE
@@ -1,6 +1,6 @@
|
||||
The MIT License (MIT)
|
||||
|
||||
Copyright (c) 2015 Jeff Becker
|
||||
Copyright (c) 2015-2017 Jeff Becker
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files (the "Software"), to deal
|
||||
|
||||
41
Makefile
Normal file
41
Makefile
Normal file
@@ -0,0 +1,41 @@
|
||||
REPO=$(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
|
||||
REPO_GOPATH=$(REPO)/go
|
||||
MINIFY=$(REPO_GOPATH)/bin/minify
|
||||
JS=$(REPO)/contrib/static/nntpchan.js
|
||||
CONTRIB_JS=$(REPO)/contrib/js/contrib
|
||||
LOCAL_JS=$(REPO)/contrib/js/nntpchan
|
||||
VENDOR_JS=$(REPO)/contrib/js/vendor
|
||||
SRND_DIR=$(REPO)/contrib/backends/srndv2
|
||||
SRND=$(REPO)/srndv2
|
||||
|
||||
all: clean build
|
||||
|
||||
build: js srnd
|
||||
|
||||
js: $(JS)
|
||||
|
||||
srnd: $(SRND)
|
||||
|
||||
$(MINIFY):
|
||||
GOPATH=$(REPO_GOPATH) go get -v github.com/tdewolff/minify/cmd/minify
|
||||
|
||||
js-deps: $(MINIFY)
|
||||
|
||||
$(JS): js-deps
|
||||
rm -f $(JS)
|
||||
for f in $(CONTRIB_JS)/*.js ; do $(MINIFY) --mime=text/javascript >> $(JS) < $$f ; done
|
||||
$(MINIFY) --mime=text/javascript >> $(JS) < $(REPO)/contrib/js/entry.js
|
||||
for f in $(LOCAL_JS)/*.js ; do $(MINIFY) --mime=text/javascript >> $(JS) < $$f ; done
|
||||
for f in $(VENDOR_JS)/*.js ; do $(MINIFY) --mime=text/javascript >> $(JS) < $$f ; done
|
||||
|
||||
|
||||
$(SRND):
|
||||
$(MAKE) -C $(SRND_DIR)
|
||||
cp $(SRND_DIR)/srndv2 $(SRND)
|
||||
|
||||
clean:
|
||||
rm -f $(SRND) $(JS)
|
||||
$(MAKE) -C $(SRND_DIR) clean
|
||||
|
||||
distclean: clean
|
||||
rm -rf $(REPO_GOPATH)
|
||||
52
README.md
52
README.md
@@ -1,26 +1,54 @@
|
||||
# NNTPChan #
|
||||
[NNTPChan](https://nntpchan.info)
|
||||
=================================
|
||||
|
||||
NNTPChan (previously known as overchan) is a decentralized imageboard that uses nntp to synchronize content between many different servers. It utilizes cryptographically signed posts to perform optional/opt-in decentralized moderation.
|
||||

|
||||
|
||||
This repository contains resources used by the core daemon which is located [here](https://github.com/majestrate/srndv2) along with general documentation, [here](doc/)
|
||||
**NNTPChan** (previously known as overchan) is a decentralized imageboard that uses the [NNTP protocol](https://en.wikipedia.org/wiki/Network_News_Transfer_Protocol) (network-news transfer protocol) to synchronize content between many different servers. It utilizes cryptographically signed posts to perform optional/opt-in decentralized moderation.
|
||||
|
||||
## getting started ##
|
||||
## Getting started
|
||||
|
||||
[This](doc) is a step-by-step guide for getting up-and-running with NNTPChan as well as documentation for developers who want to either work on NNTPChan directly or use NNTPChan in their aplications with the API.
|
||||
|
||||
## Bugs and issues
|
||||
|
||||
*PLEASE* report any bugs you find while building, setting-up or using NNTPChan on the [GitHub issue tracker](https://github.com/majestrate/nntpchan/issues), the [issue tracker on tor](http://git.psii2pdloxelodts.onion/psi/nntpchan/), the [issue tracker on i2p](http://git.psi.i2p/psi/nntpchan/) or on the [GitGud issue tracker](https://gitgud.io/jeff/nntpchan/issues) so that the probelms can be resolved or discussed.
|
||||
|
||||
## Clients
|
||||
|
||||
NNTP (confirmed working):
|
||||
|
||||
* Thunderbird
|
||||
|
||||
Web:
|
||||
|
||||
* [Yukko](https://github.com/faissaloo/Yukko): ncurses based nntpchan web ui reader
|
||||
|
||||
|
||||
[see build documentation](doc/build.md)
|
||||
## Support
|
||||
|
||||
---
|
||||
Need help? Join us on IRC.
|
||||
|
||||
*PLEASE* report any bugs you find while setting up or building [(here)](https://github.com/majestrate/nntpchan/issues) so that the problems get fixed :^)
|
||||
1. [freenode: #nntpchan](https://webchat.freenode.net/?channels=#nntpchan)
|
||||
2. [rizon: #nntpchan](https://qchat.rizon.net/?channels=#nntpchan) - Most active
|
||||
|
||||
IRC:
|
||||
## History
|
||||
|
||||
[freenode: #nntpchan](https://webchat.freenode.net/?channels=#nntpchan)
|
||||
* started in mid 2013 on anonet
|
||||
|
||||
[rizon: #nntpchan](https://qchat.rizon.net/?channels=#nntpchan)
|
||||
This is a graph of the post flow of the `overchan.test` newsgroup over 4 years, quite a big network.
|
||||
|
||||
(thnx anon who made this btw)
|
||||
|
||||
Like this project? Fund it:
|
||||

|
||||
|
||||
bitcoin: 15yuMzuueV8y5vPQQ39ZqQVz5Ey98DNrjE
|
||||
## Donations
|
||||
|
||||
Like this project? Why not help by funding it? This address pays for the server that runs `2hu-ch.org`
|
||||
|
||||
Bitcoin: [15yuMzuueV8y5vPQQ39ZqQVz5Ey98DNrjE](bitcoin://15yuMzuueV8y5vPQQ39ZqQVz5Ey98DNrjE)
|
||||
|
||||
Monero: 46thSVXSPNhJkCgUsFD9WuCjW4K41DAHGL9khni2VEqmZZhfEZVvcukCp357rfhngZdviZMaeNdj5CLqhLyeK2qZRBCyL7Q
|
||||
|
||||
## Acknowledgements
|
||||
|
||||
* [Deavmi](https://deavmi.carteronline.net/) - Making the documentation beautiful.
|
||||
|
||||
5
TODO.md
5
TODO.md
@@ -1,6 +1,7 @@
|
||||
## TODO ##
|
||||
|
||||
* extra stylesheets
|
||||
* more alternative templates
|
||||
* javascript free mod panel
|
||||
* liveui
|
||||
* better mod panel
|
||||
* easier peering
|
||||
* improve command line mod tools
|
||||
|
||||
33
build.sh
33
build.sh
@@ -1,33 +0,0 @@
|
||||
#!/usr/bin/env bash
|
||||
set -e
|
||||
root=$(readlink -e $(dirname $0))
|
||||
|
||||
tags=""
|
||||
|
||||
help_text="usage: $0 [--disable-redis]"
|
||||
|
||||
# check for help flags first
|
||||
for arg in $@ ; do
|
||||
case $arg in
|
||||
-h|--help)
|
||||
echo $help_text
|
||||
exit 0
|
||||
;;
|
||||
esac
|
||||
done
|
||||
|
||||
# check for build flags
|
||||
for arg in $@ ; do
|
||||
case $arg in
|
||||
"--disable-redis")
|
||||
tags="$tags -tags disable_redis"
|
||||
;;
|
||||
esac
|
||||
done
|
||||
|
||||
cd $root
|
||||
export GOPATH=$root/go
|
||||
mkdir -p $GOPATH
|
||||
go get -v -u $tags github.com/majestrate/srndv2
|
||||
cp -a $GOPATH/bin/srndv2 $root
|
||||
echo "Built"
|
||||
6
contrib/backends/nntpchan-daemon/.gitignore
vendored
Normal file
6
contrib/backends/nntpchan-daemon/.gitignore
vendored
Normal file
@@ -0,0 +1,6 @@
|
||||
*.o
|
||||
*.a
|
||||
nntpd
|
||||
tools/authtool
|
||||
tools/testtool
|
||||
.gdb_history
|
||||
54
contrib/backends/nntpchan-daemon/Makefile
Normal file
54
contrib/backends/nntpchan-daemon/Makefile
Normal file
@@ -0,0 +1,54 @@
|
||||
|
||||
REPO=$(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
|
||||
SRC_PATH = $(REPO)/src
|
||||
|
||||
SOURCES := $(wildcard $(SRC_PATH)/*.cpp)
|
||||
HEADERS := $(wildcard $(SRC_PATH)/*.hpp)
|
||||
OBJECTS := $(SOURCES:.cpp=.o)
|
||||
|
||||
TOOL_SRC_PATH := $(REPO)/tools
|
||||
|
||||
TOOL_SRC := $(wildcard $(TOOL_SRC_PATH)/*.cpp)
|
||||
TOOLS := $(TOOL_SRC:.cpp=)
|
||||
|
||||
DAEMON_SRC = $(REPO)/daemon
|
||||
|
||||
PKGS := libuv libsodium
|
||||
|
||||
LD_FLAGS := $(shell pkg-config --libs $(PKGS))
|
||||
INC_FLAGS := $(shell pkg-config --cflags $(PKGS)) -I $(REPO)/src
|
||||
CXXFLAGS := -std=c++11 -Wall -Wextra $(INC_FLAGS)
|
||||
|
||||
ifeq ($(DEBUG),1)
|
||||
CXXFLAGS += -g
|
||||
endif
|
||||
|
||||
LIB = $(REPO)/libnntpchan.a
|
||||
|
||||
EXE = $(REPO)/nntpd
|
||||
|
||||
|
||||
all: $(EXE) $(TOOLS)
|
||||
|
||||
$(LIB): $(OBJECTS)
|
||||
$(AR) -r $(LIB) $(OBJECTS)
|
||||
|
||||
$(EXE): $(LIB)
|
||||
$(CXX) $(CXXFLAGS) $(DAEMON_SRC)/main.cpp $(LIB) $(LD_FLAGS) -o $(EXE)
|
||||
|
||||
$(TOOL_SRC): $(LIB)
|
||||
|
||||
$(TOOLS): $(TOOL_SRC)
|
||||
$(CXX) $(CXXFLAGS) $< $(LIB) $(LD_FLAGS) -o $@
|
||||
|
||||
build-test: $(LIB)
|
||||
$(CXX) -o test $(CXXFLAGS) test.cpp $(LIB) $(LD_FLAGS)
|
||||
|
||||
test: build-test
|
||||
./test
|
||||
|
||||
%.o: src/%.cpp
|
||||
$(CXX) $(CXXFLAGS) -c -o $@
|
||||
|
||||
clean:
|
||||
rm -f $(OBJECTS) $(LIB) $(EXE) $(TOOLS)
|
||||
2
contrib/backends/nntpchan-daemon/contrib/nntpchan.sh
Executable file
2
contrib/backends/nntpchan-daemon/contrib/nntpchan.sh
Executable file
@@ -0,0 +1,2 @@
|
||||
#!/bin/sh
|
||||
exit 0
|
||||
112
contrib/backends/nntpchan-daemon/daemon/main.cpp
Normal file
112
contrib/backends/nntpchan-daemon/daemon/main.cpp
Normal file
@@ -0,0 +1,112 @@
|
||||
#include "ini.hpp"
|
||||
|
||||
#include "crypto.hpp"
|
||||
#include "storage.hpp"
|
||||
#include "nntp_server.hpp"
|
||||
#include "event.hpp"
|
||||
#include "exec_frontend.hpp"
|
||||
|
||||
#include <vector>
|
||||
#include <string>
|
||||
|
||||
|
||||
int main(int argc, char * argv[]) {
|
||||
if (argc != 2) {
|
||||
std::cerr << "usage: " << argv[0] << " config.ini" << std::endl;
|
||||
return 1;
|
||||
}
|
||||
|
||||
nntpchan::Crypto crypto();
|
||||
|
||||
nntpchan::Mainloop loop;
|
||||
|
||||
nntpchan::NNTPServer nntp(loop);
|
||||
|
||||
|
||||
std::string fname(argv[1]);
|
||||
|
||||
std::ifstream i(fname);
|
||||
|
||||
if(i.is_open()) {
|
||||
INI::Parser conf(i);
|
||||
|
||||
std::vector<std::string> requiredSections = {"nntp", "articles"};
|
||||
|
||||
auto & level = conf.top();
|
||||
|
||||
for ( const auto & section : requiredSections ) {
|
||||
if(level.sections.find(section) == level.sections.end()) {
|
||||
std::cerr << "config file " << fname << " does not have required section: ";
|
||||
std::cerr << section << std::endl;
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
|
||||
auto & storeconf = level.sections["articles"].values;
|
||||
|
||||
if (storeconf.find("store_path") == storeconf.end()) {
|
||||
std::cerr << "storage section does not have 'store_path' value" << std::endl;
|
||||
return 1;
|
||||
}
|
||||
|
||||
nntp.SetStoragePath(storeconf["store_path"]);
|
||||
|
||||
auto & nntpconf = level.sections["nntp"].values;
|
||||
|
||||
if (nntpconf.find("bind") == nntpconf.end()) {
|
||||
std::cerr << "nntp section does not have 'bind' value" << std::endl;
|
||||
return 1;
|
||||
}
|
||||
|
||||
if(nntpconf.find("instance_name") == nntpconf.end()) {
|
||||
std::cerr << "nntp section lacks 'instance_name' value" << std::endl;
|
||||
return 1;
|
||||
}
|
||||
|
||||
nntp.SetInstanceName(nntpconf["instance_name"]);
|
||||
|
||||
if (nntpconf.find("authdb") != nntpconf.end()) {
|
||||
nntp.SetLoginDB(nntpconf["authdb"]);
|
||||
}
|
||||
|
||||
if ( level.sections.find("frontend") != level.sections.end()) {
|
||||
// frontend enabled
|
||||
auto & frontconf = level.sections["frontend"].values;
|
||||
if (frontconf.find("type") == frontconf.end()) {
|
||||
std::cerr << "frontend section provided but 'type' value not provided" << std::endl;
|
||||
return 1;
|
||||
}
|
||||
auto ftype = frontconf["type"];
|
||||
if (ftype == "exec") {
|
||||
if (frontconf.find("exec") == frontconf.end()) {
|
||||
std::cerr << "exec frontend specified but no 'exec' value provided" << std::endl;
|
||||
return 1;
|
||||
}
|
||||
nntp.SetFrontend(new nntpchan::ExecFrontend(frontconf["exec"]));
|
||||
} else {
|
||||
std::cerr << "unknown frontend type '" << ftype << "'" << std::endl;
|
||||
return 1;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
auto & a = nntpconf["bind"];
|
||||
|
||||
try {
|
||||
nntp.Bind(a);
|
||||
} catch ( std::exception & ex ) {
|
||||
std::cerr << "failed to bind: " << ex.what() << std::endl;
|
||||
return 1;
|
||||
}
|
||||
|
||||
std::cerr << "nntpd for " << nntp.InstanceName() << " bound to " << a << std::endl;
|
||||
|
||||
loop.Run();
|
||||
|
||||
} else {
|
||||
std::cerr << "failed to open " << fname << std::endl;
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
7
contrib/backends/nntpchan-daemon/nntpchan.ini
Normal file
7
contrib/backends/nntpchan-daemon/nntpchan.ini
Normal file
@@ -0,0 +1,7 @@
|
||||
[nntp]
|
||||
instance_name=nntp.server.tld
|
||||
bind=[::]:1199
|
||||
authdb=auth.txt
|
||||
|
||||
[articles]
|
||||
store_path=./storage/
|
||||
234
contrib/backends/nntpchan-daemon/src/base64.cpp
Normal file
234
contrib/backends/nntpchan-daemon/src/base64.cpp
Normal file
@@ -0,0 +1,234 @@
|
||||
#include "base64.hpp"
|
||||
|
||||
|
||||
// taken from i2pd
|
||||
namespace i2p
|
||||
{
|
||||
namespace data
|
||||
{
|
||||
static void iT64Build(void);
|
||||
|
||||
/*
|
||||
*
|
||||
* BASE64 Substitution Table
|
||||
* -------------------------
|
||||
*
|
||||
* Direct Substitution Table
|
||||
*/
|
||||
|
||||
static const char T64[64] = {
|
||||
'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H',
|
||||
'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P',
|
||||
'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X',
|
||||
'Y', 'Z', 'a', 'b', 'c', 'd', 'e', 'f',
|
||||
'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n',
|
||||
'o', 'p', 'q', 'r', 's', 't', 'u', 'v',
|
||||
'w', 'x', 'y', 'z', '0', '1', '2', '3',
|
||||
'4', '5', '6', '7', '8', '9', '+', '/'
|
||||
};
|
||||
|
||||
|
||||
/*
|
||||
* Reverse Substitution Table (built in run time)
|
||||
*/
|
||||
|
||||
static char iT64[256];
|
||||
static int isFirstTime = 1;
|
||||
|
||||
/*
|
||||
* Padding
|
||||
*/
|
||||
|
||||
static char P64 = '=';
|
||||
|
||||
/*
|
||||
*
|
||||
* ByteStreamToBase64
|
||||
* ------------------
|
||||
*
|
||||
* Converts binary encoded data to BASE64 format.
|
||||
*
|
||||
*/
|
||||
static size_t /* Number of bytes in the encoded buffer */
|
||||
ByteStreamToBase64 (
|
||||
const uint8_t * InBuffer, /* Input buffer, binary data */
|
||||
size_t InCount, /* Number of bytes in the input buffer */
|
||||
char * OutBuffer, /* output buffer */
|
||||
size_t len /* length of output buffer */
|
||||
)
|
||||
|
||||
{
|
||||
unsigned char * ps;
|
||||
unsigned char * pd;
|
||||
unsigned char acc_1;
|
||||
unsigned char acc_2;
|
||||
int i;
|
||||
int n;
|
||||
int m;
|
||||
size_t outCount;
|
||||
|
||||
ps = (unsigned char *)InBuffer;
|
||||
n = InCount/3;
|
||||
m = InCount%3;
|
||||
if (!m)
|
||||
outCount = 4*n;
|
||||
else
|
||||
outCount = 4*(n+1);
|
||||
if (outCount > len) return 0;
|
||||
pd = (unsigned char *)OutBuffer;
|
||||
for ( i = 0; i<n; i++ ){
|
||||
acc_1 = *ps++;
|
||||
acc_2 = (acc_1<<4)&0x30;
|
||||
acc_1 >>= 2; /* base64 digit #1 */
|
||||
*pd++ = T64[acc_1];
|
||||
acc_1 = *ps++;
|
||||
acc_2 |= acc_1 >> 4; /* base64 digit #2 */
|
||||
*pd++ = T64[acc_2];
|
||||
acc_1 &= 0x0f;
|
||||
acc_1 <<=2;
|
||||
acc_2 = *ps++;
|
||||
acc_1 |= acc_2>>6; /* base64 digit #3 */
|
||||
*pd++ = T64[acc_1];
|
||||
acc_2 &= 0x3f; /* base64 digit #4 */
|
||||
*pd++ = T64[acc_2];
|
||||
}
|
||||
if ( m == 1 ){
|
||||
acc_1 = *ps++;
|
||||
acc_2 = (acc_1<<4)&0x3f; /* base64 digit #2 */
|
||||
acc_1 >>= 2; /* base64 digit #1 */
|
||||
*pd++ = T64[acc_1];
|
||||
*pd++ = T64[acc_2];
|
||||
*pd++ = P64;
|
||||
*pd++ = P64;
|
||||
|
||||
}
|
||||
else if ( m == 2 ){
|
||||
acc_1 = *ps++;
|
||||
acc_2 = (acc_1<<4)&0x3f;
|
||||
acc_1 >>= 2; /* base64 digit #1 */
|
||||
*pd++ = T64[acc_1];
|
||||
acc_1 = *ps++;
|
||||
acc_2 |= acc_1 >> 4; /* base64 digit #2 */
|
||||
*pd++ = T64[acc_2];
|
||||
acc_1 &= 0x0f;
|
||||
acc_1 <<=2; /* base64 digit #3 */
|
||||
*pd++ = T64[acc_1];
|
||||
*pd++ = P64;
|
||||
}
|
||||
|
||||
return outCount;
|
||||
}
|
||||
|
||||
/*
|
||||
*
|
||||
* Base64ToByteStream
|
||||
* ------------------
|
||||
*
|
||||
* Converts BASE64 encoded data to binary format. If input buffer is
|
||||
* not properly padded, buffer of negative length is returned
|
||||
*
|
||||
*/
|
||||
static
|
||||
ssize_t /* Number of output bytes */
|
||||
Base64ToByteStream (
|
||||
const char * InBuffer, /* BASE64 encoded buffer */
|
||||
size_t InCount, /* Number of input bytes */
|
||||
uint8_t * OutBuffer, /* output buffer length */
|
||||
size_t len /* length of output buffer */
|
||||
)
|
||||
{
|
||||
unsigned char * ps;
|
||||
unsigned char * pd;
|
||||
unsigned char acc_1;
|
||||
unsigned char acc_2;
|
||||
int i;
|
||||
int n;
|
||||
int m;
|
||||
size_t outCount;
|
||||
|
||||
if (isFirstTime) iT64Build();
|
||||
n = InCount/4;
|
||||
m = InCount%4;
|
||||
if (InCount && !m)
|
||||
outCount = 3*n;
|
||||
else {
|
||||
outCount = 0;
|
||||
return 0;
|
||||
}
|
||||
|
||||
ps = (unsigned char *)(InBuffer + InCount - 1);
|
||||
while ( *ps-- == P64 ) outCount--;
|
||||
ps = (unsigned char *)InBuffer;
|
||||
|
||||
if (outCount > len) return -1;
|
||||
pd = OutBuffer;
|
||||
auto endOfOutBuffer = OutBuffer + outCount;
|
||||
for ( i = 0; i < n; i++ ){
|
||||
acc_1 = iT64[*ps++];
|
||||
acc_2 = iT64[*ps++];
|
||||
acc_1 <<= 2;
|
||||
acc_1 |= acc_2>>4;
|
||||
*pd++ = acc_1;
|
||||
if (pd >= endOfOutBuffer) break;
|
||||
|
||||
acc_2 <<= 4;
|
||||
acc_1 = iT64[*ps++];
|
||||
acc_2 |= acc_1 >> 2;
|
||||
*pd++ = acc_2;
|
||||
if (pd >= endOfOutBuffer) break;
|
||||
|
||||
acc_2 = iT64[*ps++];
|
||||
acc_2 |= acc_1 << 6;
|
||||
*pd++ = acc_2;
|
||||
}
|
||||
|
||||
return outCount;
|
||||
}
|
||||
|
||||
static size_t Base64EncodingBufferSize (const size_t input_size)
|
||||
{
|
||||
auto d = div (input_size, 3);
|
||||
if (d.rem) d.quot++;
|
||||
return 4*d.quot;
|
||||
}
|
||||
|
||||
/*
|
||||
*
|
||||
* iT64
|
||||
* ----
|
||||
* Reverse table builder. P64 character is replaced with 0
|
||||
*
|
||||
*
|
||||
*/
|
||||
|
||||
static void iT64Build()
|
||||
{
|
||||
int i;
|
||||
isFirstTime = 0;
|
||||
for ( i=0; i<256; i++ ) iT64[i] = -1;
|
||||
for ( i=0; i<64; i++ ) iT64[(int)T64[i]] = i;
|
||||
iT64[(int)P64] = 0;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
namespace nntpchan
|
||||
{
|
||||
std::string B64Encode(const uint8_t * data, const std::size_t l)
|
||||
{
|
||||
std::string out;
|
||||
out.resize(i2p::data::Base64EncodingBufferSize(l));
|
||||
i2p::data::ByteStreamToBase64(data, l, &out[0], out.size());
|
||||
return out;
|
||||
}
|
||||
|
||||
bool B64Decode(const std::string & data, std::vector<uint8_t> & out)
|
||||
{
|
||||
out.resize(data.size());
|
||||
if(i2p::data::Base64ToByteStream(data.c_str(), data.size(), &out[0], out.size()) == -1) return false;
|
||||
out.shrink_to_fit();
|
||||
return true;
|
||||
}
|
||||
}
|
||||
17
contrib/backends/nntpchan-daemon/src/base64.hpp
Normal file
17
contrib/backends/nntpchan-daemon/src/base64.hpp
Normal file
@@ -0,0 +1,17 @@
|
||||
#ifndef NNTPCHAN_BASE64_HPP
|
||||
#define NNTPCHAN_BASE64_HPP
|
||||
#include <string>
|
||||
#include <vector>
|
||||
|
||||
namespace nntpchan
|
||||
{
|
||||
/** returns base64 encoded string */
|
||||
std::string B64Encode(const uint8_t * data, const std::size_t l);
|
||||
|
||||
/** @brief returns true if decode was successful */
|
||||
bool B64Decode(const std::string & data, std::vector<uint8_t> & out);
|
||||
|
||||
}
|
||||
|
||||
|
||||
#endif
|
||||
21
contrib/backends/nntpchan-daemon/src/buffer.cpp
Normal file
21
contrib/backends/nntpchan-daemon/src/buffer.cpp
Normal file
@@ -0,0 +1,21 @@
|
||||
#include "buffer.hpp"
|
||||
#include <cstring>
|
||||
|
||||
namespace nntpchan
|
||||
{
|
||||
WriteBuffer::WriteBuffer(const char * b, const size_t s)
|
||||
{
|
||||
char * buf = new char[s];
|
||||
std::memcpy(buf, b, s);
|
||||
this->b = uv_buf_init(buf, s);
|
||||
w.data = this;
|
||||
};
|
||||
|
||||
WriteBuffer::WriteBuffer(const std::string & s) : WriteBuffer(s.c_str(), s.size()) {}
|
||||
|
||||
WriteBuffer::~WriteBuffer()
|
||||
{
|
||||
delete [] b.base;
|
||||
}
|
||||
}
|
||||
|
||||
19
contrib/backends/nntpchan-daemon/src/buffer.hpp
Normal file
19
contrib/backends/nntpchan-daemon/src/buffer.hpp
Normal file
@@ -0,0 +1,19 @@
|
||||
#ifndef NNTPCHAN_BUFFER_HPP
|
||||
#define NNTPCHAN_BUFFER_HPP
|
||||
#include <uv.h>
|
||||
#include <string>
|
||||
|
||||
namespace nntpchan
|
||||
{
|
||||
struct WriteBuffer
|
||||
{
|
||||
uv_write_t w;
|
||||
uv_buf_t b;
|
||||
|
||||
WriteBuffer(const std::string & s);
|
||||
WriteBuffer(const char * b, const size_t s);
|
||||
~WriteBuffer();
|
||||
};
|
||||
}
|
||||
|
||||
#endif
|
||||
20
contrib/backends/nntpchan-daemon/src/crypto.cpp
Normal file
20
contrib/backends/nntpchan-daemon/src/crypto.cpp
Normal file
@@ -0,0 +1,20 @@
|
||||
#include "crypto.hpp"
|
||||
#include <sodium.h>
|
||||
#include <cassert>
|
||||
|
||||
namespace nntpchan
|
||||
{
|
||||
void SHA512(const uint8_t * d, const std::size_t l, SHA512Digest & h)
|
||||
{
|
||||
crypto_hash(h.data(), d, l);
|
||||
}
|
||||
|
||||
Crypto::Crypto()
|
||||
{
|
||||
assert(sodium_init() == 0);
|
||||
}
|
||||
|
||||
Crypto::~Crypto()
|
||||
{
|
||||
}
|
||||
}
|
||||
22
contrib/backends/nntpchan-daemon/src/crypto.hpp
Normal file
22
contrib/backends/nntpchan-daemon/src/crypto.hpp
Normal file
@@ -0,0 +1,22 @@
|
||||
#ifndef NNTPCHAN_CRYPTO_HPP
|
||||
#define NNTPCHAN_CRYPTO_HPP
|
||||
|
||||
#include <sodium/crypto_hash.h>
|
||||
#include <array>
|
||||
|
||||
namespace nntpchan
|
||||
{
|
||||
typedef std::array<uint8_t, crypto_hash_BYTES> SHA512Digest;
|
||||
|
||||
void SHA512(const uint8_t * d, std::size_t l, SHA512Digest & h);
|
||||
|
||||
/** global crypto initializer */
|
||||
struct Crypto
|
||||
{
|
||||
Crypto();
|
||||
~Crypto();
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
#endif
|
||||
27
contrib/backends/nntpchan-daemon/src/event.cpp
Normal file
27
contrib/backends/nntpchan-daemon/src/event.cpp
Normal file
@@ -0,0 +1,27 @@
|
||||
#include "event.hpp"
|
||||
#include <cassert>
|
||||
|
||||
namespace nntpchan
|
||||
{
|
||||
Mainloop::Mainloop()
|
||||
{
|
||||
m_loop = uv_default_loop();
|
||||
assert(uv_loop_init(m_loop) == 0);
|
||||
}
|
||||
|
||||
Mainloop::~Mainloop()
|
||||
{
|
||||
uv_loop_close(m_loop);
|
||||
}
|
||||
|
||||
void Mainloop::Stop()
|
||||
{
|
||||
uv_stop(m_loop);
|
||||
}
|
||||
|
||||
void Mainloop::Run(uv_run_mode mode)
|
||||
{
|
||||
assert(uv_run(m_loop, mode) == 0);
|
||||
}
|
||||
|
||||
}
|
||||
26
contrib/backends/nntpchan-daemon/src/event.hpp
Normal file
26
contrib/backends/nntpchan-daemon/src/event.hpp
Normal file
@@ -0,0 +1,26 @@
|
||||
#ifndef NNTPCHAN_EVENT_HPP
|
||||
#define NNTPCHAN_EVENT_HPP
|
||||
#include <uv.h>
|
||||
|
||||
namespace nntpchan
|
||||
{
|
||||
class Mainloop
|
||||
{
|
||||
public:
|
||||
|
||||
Mainloop();
|
||||
~Mainloop();
|
||||
|
||||
operator uv_loop_t * () const { return m_loop; }
|
||||
|
||||
void Run(uv_run_mode mode = UV_RUN_DEFAULT);
|
||||
void Stop();
|
||||
|
||||
private:
|
||||
|
||||
uv_loop_t * m_loop;
|
||||
|
||||
};
|
||||
}
|
||||
|
||||
#endif
|
||||
57
contrib/backends/nntpchan-daemon/src/exec_frontend.cpp
Normal file
57
contrib/backends/nntpchan-daemon/src/exec_frontend.cpp
Normal file
@@ -0,0 +1,57 @@
|
||||
#include "exec_frontend.hpp"
|
||||
#include <cstring>
|
||||
#include <iostream>
|
||||
#include <errno.h>
|
||||
#include <unistd.h>
|
||||
#include <sys/wait.h>
|
||||
|
||||
namespace nntpchan
|
||||
{
|
||||
ExecFrontend::ExecFrontend(const std::string & fname) :
|
||||
m_exec(fname)
|
||||
{
|
||||
}
|
||||
|
||||
ExecFrontend::~ExecFrontend() {}
|
||||
|
||||
void ExecFrontend::ProcessNewMessage(const std::string & fpath)
|
||||
{
|
||||
Exec({"post", fpath});
|
||||
}
|
||||
|
||||
bool ExecFrontend::AcceptsNewsgroup(const std::string & newsgroup)
|
||||
{
|
||||
return Exec({"newsgroup", newsgroup}) == 0;
|
||||
}
|
||||
|
||||
bool ExecFrontend::AcceptsMessage(const std::string & msgid)
|
||||
{
|
||||
return Exec({"msgid", msgid}) == 0;
|
||||
}
|
||||
|
||||
int ExecFrontend::Exec(std::deque<std::string> args)
|
||||
{
|
||||
// set up arguments
|
||||
const char ** cargs = new char const *[args.size() +2];
|
||||
std::size_t l = 0;
|
||||
cargs[l++] = m_exec.c_str();
|
||||
while (args.size()) {
|
||||
cargs[l++] = args.front().c_str();
|
||||
args.pop_front();
|
||||
}
|
||||
cargs[l] = 0;
|
||||
int retcode = 0;
|
||||
pid_t child = fork();
|
||||
if(child) {
|
||||
waitpid(child, &retcode, 0);
|
||||
} else {
|
||||
int r = execvpe(m_exec.c_str(),(char * const *) cargs, environ);
|
||||
if ( r == -1 ) {
|
||||
std::cout << strerror(errno) << std::endl;
|
||||
exit( errno );
|
||||
} else
|
||||
exit(r);
|
||||
}
|
||||
return retcode;
|
||||
}
|
||||
}
|
||||
30
contrib/backends/nntpchan-daemon/src/exec_frontend.hpp
Normal file
30
contrib/backends/nntpchan-daemon/src/exec_frontend.hpp
Normal file
@@ -0,0 +1,30 @@
|
||||
#ifndef NNTPCHAN_EXEC_FRONTEND_HPP
|
||||
#define NNTPCHAN_EXEC_FRONTEND_HPP
|
||||
#include "frontend.hpp"
|
||||
#include <deque>
|
||||
|
||||
namespace nntpchan
|
||||
{
|
||||
class ExecFrontend : public Frontend
|
||||
{
|
||||
public:
|
||||
|
||||
ExecFrontend(const std::string & exe);
|
||||
|
||||
~ExecFrontend();
|
||||
|
||||
void ProcessNewMessage(const std::string & fpath);
|
||||
bool AcceptsNewsgroup(const std::string & newsgroup);
|
||||
bool AcceptsMessage(const std::string & msgid);
|
||||
|
||||
private:
|
||||
|
||||
int Exec(std::deque<std::string> args);
|
||||
|
||||
private:
|
||||
std::string m_exec;
|
||||
|
||||
};
|
||||
}
|
||||
|
||||
#endif
|
||||
25
contrib/backends/nntpchan-daemon/src/frontend.hpp
Normal file
25
contrib/backends/nntpchan-daemon/src/frontend.hpp
Normal file
@@ -0,0 +1,25 @@
|
||||
#ifndef NNTPCHAN_FRONTEND_HPP
|
||||
#define NNTPCHAN_FRONTEND_HPP
|
||||
#include <string>
|
||||
|
||||
namespace nntpchan
|
||||
{
|
||||
/** @brief nntpchan frontend ui interface */
|
||||
class Frontend
|
||||
{
|
||||
public:
|
||||
virtual ~Frontend() {}
|
||||
|
||||
/** @brief process an inbound message stored at fpath that we have accepted. */
|
||||
virtual void ProcessNewMessage(const std::string & fpath) = 0;
|
||||
|
||||
/** @brief return true if we take posts in a newsgroup */
|
||||
virtual bool AcceptsNewsgroup(const std::string & newsgroup) = 0;
|
||||
|
||||
/** @brief return true if we will accept a message given its message-id */
|
||||
virtual bool AcceptsMessage(const std::string & msgid) = 0;
|
||||
|
||||
};
|
||||
}
|
||||
|
||||
#endif
|
||||
6
contrib/backends/nntpchan-daemon/src/http.hpp
Normal file
6
contrib/backends/nntpchan-daemon/src/http.hpp
Normal file
@@ -0,0 +1,6 @@
|
||||
#ifndef NNTPCHAN_HTTP_HPP
|
||||
#define NNTPCHAN_HTTP_HPP
|
||||
|
||||
|
||||
|
||||
#endif
|
||||
5
contrib/backends/nntpchan-daemon/src/http_client.hpp
Normal file
5
contrib/backends/nntpchan-daemon/src/http_client.hpp
Normal file
@@ -0,0 +1,5 @@
|
||||
#ifndef NNTPCHAN_HTTP_CLIENT_HPP
|
||||
#define NNTPCHAN_HTTP_CLIENT_HPP
|
||||
|
||||
|
||||
#endif
|
||||
6
contrib/backends/nntpchan-daemon/src/http_server.hpp
Normal file
6
contrib/backends/nntpchan-daemon/src/http_server.hpp
Normal file
@@ -0,0 +1,6 @@
|
||||
#ifndef NNTPCHAN_HTTP_SERVER_HPP
|
||||
#define NNTPCHAN_HTTP_SERVER_HPP
|
||||
|
||||
|
||||
|
||||
#endif
|
||||
186
contrib/backends/nntpchan-daemon/src/ini.hpp
Normal file
186
contrib/backends/nntpchan-daemon/src/ini.hpp
Normal file
@@ -0,0 +1,186 @@
|
||||
/**
|
||||
* The MIT License (MIT)
|
||||
* Copyright (c) <2015> <carriez.md@gmail.com>
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
* of this software and associated documentation files (the "Software"), to
|
||||
* deal in the Software without restriction, including without limitation the
|
||||
* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
|
||||
* sell copies of the Software, and to permit persons to whom the Software is
|
||||
* furnished to do so, subject to the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included in
|
||||
* all copies or substantial portions of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||
* THE SOFTWARE.
|
||||
*
|
||||
*/
|
||||
|
||||
#ifndef INI_HPP
|
||||
#define INI_HPP
|
||||
|
||||
#include <cassert>
|
||||
#include <map>
|
||||
#include <list>
|
||||
#include <stdexcept>
|
||||
#include <string>
|
||||
#include <cstring>
|
||||
#include <iostream>
|
||||
#include <fstream>
|
||||
|
||||
namespace INI {
|
||||
|
||||
struct Level
|
||||
{
|
||||
Level() : parent(NULL), depth(0) {}
|
||||
Level(Level* p) : parent(p), depth(0) {}
|
||||
|
||||
typedef std::map<std::string, std::string> value_map_t;
|
||||
typedef std::map<std::string, Level> section_map_t;
|
||||
typedef std::list<value_map_t::const_iterator> values_t;
|
||||
typedef std::list<section_map_t::const_iterator> sections_t;
|
||||
value_map_t values;
|
||||
section_map_t sections;
|
||||
values_t ordered_values; // original order in the ini file
|
||||
sections_t ordered_sections;
|
||||
Level* parent;
|
||||
size_t depth;
|
||||
|
||||
const std::string& operator[](const std::string& name) { return values[name]; }
|
||||
Level& operator()(const std::string& name) { return sections[name]; }
|
||||
};
|
||||
|
||||
class Parser
|
||||
{
|
||||
public:
|
||||
Parser(const char* fn);
|
||||
Parser(std::istream& f) : f_(&f), ln_(0) { parse(top_); }
|
||||
Level& top() { return top_; }
|
||||
void dump(std::ostream& s) { dump(s, top(), ""); }
|
||||
|
||||
private:
|
||||
void dump(std::ostream& s, const Level& l, const std::string& sname);
|
||||
void parse(Level& l);
|
||||
void parseSLine(std::string& sname, size_t& depth);
|
||||
void err(const char* s);
|
||||
|
||||
private:
|
||||
Level top_;
|
||||
std::ifstream f0_;
|
||||
std::istream* f_;
|
||||
std::string line_;
|
||||
size_t ln_;
|
||||
};
|
||||
|
||||
inline void
|
||||
Parser::err(const char* s)
|
||||
{
|
||||
char buf[256];
|
||||
sprintf(buf, "%s on line #%ld", s, ln_);
|
||||
throw std::runtime_error(buf);
|
||||
}
|
||||
|
||||
inline std::string trim(const std::string& s)
|
||||
{
|
||||
char p[] = " \t\r\n";
|
||||
long sp = 0;
|
||||
long ep = s.length() - 1;
|
||||
for (; sp <= ep; ++sp)
|
||||
if (!strchr(p, s[sp])) break;
|
||||
for (; ep >= 0; --ep)
|
||||
if (!strchr(p, s[ep])) break;
|
||||
return s.substr(sp, ep-sp+1);
|
||||
}
|
||||
|
||||
inline
|
||||
Parser::Parser(const char* fn) : f0_(fn), f_(&f0_), ln_(0)
|
||||
{
|
||||
if (!f0_)
|
||||
throw std::runtime_error(std::string("failed to open file: ") + fn);
|
||||
|
||||
parse(top_);
|
||||
}
|
||||
|
||||
inline void
|
||||
Parser::parseSLine(std::string& sname, size_t& depth)
|
||||
{
|
||||
depth = 0;
|
||||
for (; depth < line_.length(); ++depth)
|
||||
if (line_[depth] != '[') break;
|
||||
|
||||
sname = line_.substr(depth, line_.length() - 2*depth);
|
||||
}
|
||||
|
||||
inline void
|
||||
Parser::parse(Level& l)
|
||||
{
|
||||
while (std::getline(*f_, line_)) {
|
||||
++ln_;
|
||||
if (line_[0] == '#' || line_[0] == ';') continue;
|
||||
line_ = trim(line_);
|
||||
if (line_.empty()) continue;
|
||||
if (line_[0] == '[') {
|
||||
size_t depth;
|
||||
std::string sname;
|
||||
parseSLine(sname, depth);
|
||||
Level* lp = NULL;
|
||||
Level* parent = &l;
|
||||
if (depth > l.depth + 1)
|
||||
err("section with wrong depth");
|
||||
if (l.depth == depth-1)
|
||||
lp = &l.sections[sname];
|
||||
else {
|
||||
lp = l.parent;
|
||||
size_t n = l.depth - depth;
|
||||
for (size_t i = 0; i < n; ++i) lp = lp->parent;
|
||||
parent = lp;
|
||||
lp = &lp->sections[sname];
|
||||
}
|
||||
if (lp->depth != 0)
|
||||
err("duplicate section name on the same level");
|
||||
if (!lp->parent) {
|
||||
lp->depth = depth;
|
||||
lp->parent = parent;
|
||||
}
|
||||
parent->ordered_sections.push_back(parent->sections.find(sname));
|
||||
parse(*lp);
|
||||
} else {
|
||||
size_t n = line_.find('=');
|
||||
if (n == std::string::npos)
|
||||
err("no '=' found");
|
||||
std::pair<Level::value_map_t::const_iterator, bool> res =
|
||||
l.values.insert(std::make_pair(trim(line_.substr(0, n)),
|
||||
trim(line_.substr(n+1, line_.length()-n-1))));
|
||||
if (!res.second)
|
||||
err("duplicated key found");
|
||||
l.ordered_values.push_back(res.first);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
inline void
|
||||
Parser::dump(std::ostream& s, const Level& l, const std::string& sname)
|
||||
{
|
||||
if (!sname.empty()) s << '\n';
|
||||
for (size_t i = 0; i < l.depth; ++i) s << '[';
|
||||
if (!sname.empty()) s << sname;
|
||||
for (size_t i = 0; i < l.depth; ++i) s << ']';
|
||||
if (!sname.empty()) s << std::endl;
|
||||
for (Level::values_t::const_iterator it = l.ordered_values.begin(); it != l.ordered_values.end(); ++it)
|
||||
s << (*it)->first << '=' << (*it)->second << std::endl;
|
||||
for (Level::sections_t::const_iterator it = l.ordered_sections.begin(); it != l.ordered_sections.end(); ++it) {
|
||||
assert((*it)->second.depth == l.depth+1);
|
||||
dump(s, (*it)->second, (*it)->first);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
#endif // INI_HPP
|
||||
|
||||
39
contrib/backends/nntpchan-daemon/src/line.cpp
Normal file
39
contrib/backends/nntpchan-daemon/src/line.cpp
Normal file
@@ -0,0 +1,39 @@
|
||||
#include "line.hpp"
|
||||
|
||||
namespace nntpchan {
|
||||
|
||||
LineReader::LineReader(size_t limit) : m_close(false), lineLimit(limit) {}
|
||||
|
||||
void LineReader::Data(const char * data, ssize_t l)
|
||||
{
|
||||
if(l <= 0) return;
|
||||
// process leftovers
|
||||
std::size_t idx = 0;
|
||||
std::size_t pos = 0;
|
||||
while(l-- > 0) {
|
||||
char c = data[idx++];
|
||||
if(c == '\n') {
|
||||
OnLine(data, pos);
|
||||
pos = 0;
|
||||
data += idx;
|
||||
} else if (c == '\r' && data[idx] == '\n') {
|
||||
OnLine(data, pos);
|
||||
data += idx + 1;
|
||||
pos = 0;
|
||||
} else {
|
||||
pos ++;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void LineReader::OnLine(const char *d, const size_t l)
|
||||
{
|
||||
std::string line(d, l);
|
||||
HandleLine(line);
|
||||
}
|
||||
|
||||
bool LineReader::ShouldClose()
|
||||
{
|
||||
return m_close;
|
||||
}
|
||||
}
|
||||
34
contrib/backends/nntpchan-daemon/src/line.hpp
Normal file
34
contrib/backends/nntpchan-daemon/src/line.hpp
Normal file
@@ -0,0 +1,34 @@
|
||||
#ifndef NNTPCHAN_LINE_HPP
|
||||
#define NNTPCHAN_LINE_HPP
|
||||
#include "server.hpp"
|
||||
#include <stdint.h>
|
||||
namespace nntpchan
|
||||
{
|
||||
|
||||
/** @brief a buffered line reader */
|
||||
class LineReader
|
||||
{
|
||||
public:
|
||||
|
||||
LineReader(size_t lineLimit);
|
||||
|
||||
/** @brief queue inbound data from connection */
|
||||
void Data(const char * data, ssize_t s);
|
||||
|
||||
/** implements IConnHandler */
|
||||
virtual bool ShouldClose();
|
||||
|
||||
protected:
|
||||
/** @brief handle a line from the client */
|
||||
virtual void HandleLine(const std::string & line) = 0;
|
||||
|
||||
|
||||
private:
|
||||
void OnLine(const char * d, const size_t l);
|
||||
std::string m_leftovers;
|
||||
bool m_close;
|
||||
const size_t lineLimit;
|
||||
};
|
||||
}
|
||||
|
||||
#endif
|
||||
28
contrib/backends/nntpchan-daemon/src/message.cpp
Normal file
28
contrib/backends/nntpchan-daemon/src/message.cpp
Normal file
@@ -0,0 +1,28 @@
|
||||
#include "message.hpp"
|
||||
|
||||
namespace nntpchan
|
||||
{
|
||||
bool IsValidMessageID(const std::string & msgid)
|
||||
{
|
||||
if(msgid[0] != '<') return false;
|
||||
if(msgid[msgid.size()-1] != '>') return false;
|
||||
auto itr = msgid.begin() + 1;
|
||||
auto end = msgid.end() - 1;
|
||||
bool atfound = false;
|
||||
while(itr != end) {
|
||||
auto c = *itr;
|
||||
++itr;
|
||||
if(atfound && c == '@') return false;
|
||||
if(c == '@') {
|
||||
atfound = true;
|
||||
continue;
|
||||
}
|
||||
if (c == '$' || c == '_' || c == '-' || c == '.') continue;
|
||||
if (c >= '0' && c <= '9') continue;
|
||||
if (c >= 'A' && c <= 'Z') continue;
|
||||
if (c >= 'a' && c <= 'z') continue;
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
}
|
||||
34
contrib/backends/nntpchan-daemon/src/message.hpp
Normal file
34
contrib/backends/nntpchan-daemon/src/message.hpp
Normal file
@@ -0,0 +1,34 @@
|
||||
#ifndef NNTPCHAN_MESSAGE_HPP
|
||||
#define NNTPCHAN_MESSAGE_HPP
|
||||
|
||||
#include <string>
|
||||
#include <vector>
|
||||
#include <map>
|
||||
#include <functional>
|
||||
|
||||
namespace nntpchan
|
||||
{
|
||||
bool IsValidMessageID(const std::string & msgid);
|
||||
|
||||
typedef std::pair<std::string, std::string> MessageHeader;
|
||||
|
||||
typedef std::map<std::string, std::string> MIMEPartHeader;
|
||||
|
||||
typedef std::function<bool(const MessageHeader &)> MessageHeaderFilter;
|
||||
|
||||
typedef std::function<bool(const MIMEPartHeader &)> MIMEPartFilter;
|
||||
|
||||
/**
|
||||
read MIME message from i,
|
||||
filter each header with h,
|
||||
filter each part with p,
|
||||
store result in o
|
||||
|
||||
return true if we read the whole message, return false if there is remaining
|
||||
*/
|
||||
bool StoreMIMEMessage(std::istream & i, MessageHeaderFilter h, MIMEPartHeader p, std::ostream & o);
|
||||
|
||||
}
|
||||
|
||||
|
||||
#endif
|
||||
262
contrib/backends/nntpchan-daemon/src/mustache.cpp
Normal file
262
contrib/backends/nntpchan-daemon/src/mustache.cpp
Normal file
@@ -0,0 +1,262 @@
|
||||
/*
|
||||
Author: José Bollo <jobol@nonadev.net>
|
||||
Author: José Bollo <jose.bollo@iot.bzh>
|
||||
|
||||
https://gitlab.com/jobol/mustach
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
*/
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
#include <errno.h>
|
||||
#include <ctype.h>
|
||||
|
||||
#include "mustache.hpp"
|
||||
|
||||
#define NAME_LENGTH_MAX 1024
|
||||
#define DEPTH_MAX 256
|
||||
|
||||
namespace nntpchan
|
||||
{
|
||||
namespace mustache
|
||||
{
|
||||
|
||||
|
||||
static int getpartial(struct mustach_itf *itf, void *closure, const char *name, char **result)
|
||||
{
|
||||
int rc;
|
||||
FILE *file;
|
||||
size_t size;
|
||||
|
||||
*result = NULL;
|
||||
file = open_memstream(result, &size);
|
||||
if (file == NULL)
|
||||
rc = MUSTACH_ERROR_SYSTEM;
|
||||
else {
|
||||
rc = itf->put(closure, name, 0, file);
|
||||
if (rc == 0)
|
||||
/* adds terminating null */
|
||||
rc = fputc(0, file) ? MUSTACH_ERROR_SYSTEM : 0;
|
||||
fclose(file);
|
||||
if (rc < 0) {
|
||||
free(*result);
|
||||
*result = NULL;
|
||||
}
|
||||
}
|
||||
return rc;
|
||||
}
|
||||
|
||||
static int process(const char *templ, struct mustach_itf *itf, void *closure, FILE *file, const char *opstr, const char *clstr)
|
||||
{
|
||||
char name[NAME_LENGTH_MAX + 1], *partial, c;
|
||||
const char *beg, *term;
|
||||
struct { const char *name, *again; size_t length; int emit, entered; } stack[DEPTH_MAX];
|
||||
size_t oplen, cllen, len, l;
|
||||
int depth, rc, emit;
|
||||
|
||||
emit = 1;
|
||||
oplen = strlen(opstr);
|
||||
cllen = strlen(clstr);
|
||||
depth = 0;
|
||||
for(;;) {
|
||||
beg = strstr(templ, opstr);
|
||||
if (beg == NULL) {
|
||||
/* no more mustach */
|
||||
if (emit)
|
||||
fwrite(templ, strlen(templ), 1, file);
|
||||
return depth ? MUSTACH_ERROR_UNEXPECTED_END : 0;
|
||||
}
|
||||
if (emit)
|
||||
fwrite(templ, (size_t)(beg - templ), 1, file);
|
||||
beg += oplen;
|
||||
term = strstr(beg, clstr);
|
||||
if (term == NULL)
|
||||
return MUSTACH_ERROR_UNEXPECTED_END;
|
||||
templ = term + cllen;
|
||||
len = (size_t)(term - beg);
|
||||
c = *beg;
|
||||
switch(c) {
|
||||
case '!':
|
||||
case '=':
|
||||
break;
|
||||
case '{':
|
||||
for (l = 0 ; clstr[l] == '}' ; l++);
|
||||
if (clstr[l]) {
|
||||
if (!len || beg[len-1] != '}')
|
||||
return MUSTACH_ERROR_BAD_UNESCAPE_TAG;
|
||||
len--;
|
||||
} else {
|
||||
if (term[l] != '}')
|
||||
return MUSTACH_ERROR_BAD_UNESCAPE_TAG;
|
||||
templ++;
|
||||
}
|
||||
c = '&';
|
||||
case '^':
|
||||
case '#':
|
||||
case '/':
|
||||
case '&':
|
||||
case '>':
|
||||
#if !defined(NO_EXTENSION_FOR_MUSTACH) && !defined(NO_COLON_EXTENSION_FOR_MUSTACH)
|
||||
case ':':
|
||||
#endif
|
||||
beg++; len--;
|
||||
default:
|
||||
while (len && isspace(beg[0])) { beg++; len--; }
|
||||
while (len && isspace(beg[len-1])) len--;
|
||||
if (len == 0)
|
||||
return MUSTACH_ERROR_EMPTY_TAG;
|
||||
if (len > NAME_LENGTH_MAX)
|
||||
return MUSTACH_ERROR_TAG_TOO_LONG;
|
||||
memcpy(name, beg, len);
|
||||
name[len] = 0;
|
||||
break;
|
||||
}
|
||||
switch(c) {
|
||||
case '!':
|
||||
/* comment */
|
||||
/* nothing to do */
|
||||
break;
|
||||
case '=':
|
||||
/* defines separators */
|
||||
if (len < 5 || beg[len - 1] != '=')
|
||||
return MUSTACH_ERROR_BAD_SEPARATORS;
|
||||
beg++;
|
||||
len -= 2;
|
||||
for (l = 0; l < len && !isspace(beg[l]) ; l++);
|
||||
if (l == len)
|
||||
return MUSTACH_ERROR_BAD_SEPARATORS;
|
||||
opstr = strndupa(beg, l);
|
||||
while (l < len && isspace(beg[l])) l++;
|
||||
if (l == len)
|
||||
return MUSTACH_ERROR_BAD_SEPARATORS;
|
||||
clstr = strndupa(beg + l, len - l);
|
||||
oplen = strlen(opstr);
|
||||
cllen = strlen(clstr);
|
||||
break;
|
||||
case '^':
|
||||
case '#':
|
||||
/* begin section */
|
||||
if (depth == DEPTH_MAX)
|
||||
return MUSTACH_ERROR_TOO_DEPTH;
|
||||
rc = emit;
|
||||
if (rc) {
|
||||
rc = itf->enter(closure, name);
|
||||
if (rc < 0)
|
||||
return rc;
|
||||
}
|
||||
stack[depth].name = beg;
|
||||
stack[depth].again = templ;
|
||||
stack[depth].length = len;
|
||||
stack[depth].emit = emit;
|
||||
stack[depth].entered = rc;
|
||||
if ((c == '#') == (rc == 0))
|
||||
emit = 0;
|
||||
depth++;
|
||||
break;
|
||||
case '/':
|
||||
/* end section */
|
||||
if (depth-- == 0 || len != stack[depth].length || memcmp(stack[depth].name, name, len))
|
||||
return MUSTACH_ERROR_CLOSING;
|
||||
rc = emit && stack[depth].entered ? itf->next(closure) : 0;
|
||||
if (rc < 0)
|
||||
return rc;
|
||||
if (rc) {
|
||||
templ = stack[depth++].again;
|
||||
} else {
|
||||
emit = stack[depth].emit;
|
||||
if (emit && stack[depth].entered)
|
||||
itf->leave(closure);
|
||||
}
|
||||
break;
|
||||
case '>':
|
||||
/* partials */
|
||||
if (emit) {
|
||||
rc = getpartial(itf, closure, name, &partial);
|
||||
if (rc == 0) {
|
||||
rc = process(partial, itf, closure, file, opstr, clstr);
|
||||
free(partial);
|
||||
}
|
||||
if (rc < 0)
|
||||
return rc;
|
||||
}
|
||||
break;
|
||||
default:
|
||||
/* replacement */
|
||||
if (emit) {
|
||||
rc = itf->put(closure, name, c != '&', file);
|
||||
if (rc < 0)
|
||||
return rc;
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
int fmustach(const char *templ, struct mustach_itf *itf, void *closure, FILE *file)
|
||||
{
|
||||
int rc = itf->start ? itf->start(closure) : 0;
|
||||
if (rc == 0)
|
||||
rc = process(templ, itf, closure, file, "{{", "}}");
|
||||
return rc;
|
||||
}
|
||||
|
||||
int fdmustach(const char *templ, struct mustach_itf *itf, void *closure, int fd)
|
||||
{
|
||||
int rc;
|
||||
FILE *file;
|
||||
|
||||
file = fdopen(fd, "w");
|
||||
if (file == NULL) {
|
||||
rc = MUSTACH_ERROR_SYSTEM;
|
||||
errno = ENOMEM;
|
||||
} else {
|
||||
rc = fmustach(templ, itf, closure, file);
|
||||
fclose(file);
|
||||
}
|
||||
return rc;
|
||||
}
|
||||
|
||||
int mustach(const char *templ, struct mustach_itf *itf, void *closure, char **result, size_t *size)
|
||||
{
|
||||
int rc;
|
||||
FILE *file;
|
||||
size_t s;
|
||||
|
||||
*result = NULL;
|
||||
if (size == NULL)
|
||||
size = &s;
|
||||
file = open_memstream(result, size);
|
||||
if (file == NULL) {
|
||||
rc = MUSTACH_ERROR_SYSTEM;
|
||||
errno = ENOMEM;
|
||||
} else {
|
||||
rc = fmustach(templ, itf, closure, file);
|
||||
if (rc == 0)
|
||||
/* adds terminating null */
|
||||
rc = fputc(0, file) ? MUSTACH_ERROR_SYSTEM : 0;
|
||||
fclose(file);
|
||||
if (rc >= 0)
|
||||
/* removes terminating null of the length */
|
||||
(*size)--;
|
||||
else {
|
||||
free(*result);
|
||||
*result = NULL;
|
||||
*size = 0;
|
||||
}
|
||||
}
|
||||
return rc;
|
||||
}
|
||||
}
|
||||
}
|
||||
96
contrib/backends/nntpchan-daemon/src/mustache.hpp
Normal file
96
contrib/backends/nntpchan-daemon/src/mustache.hpp
Normal file
@@ -0,0 +1,96 @@
|
||||
#ifndef NNTPCHAN_MUSTACHE
|
||||
#define NNTPCHAN_MUSTACHE
|
||||
|
||||
/*
|
||||
Author: José Bollo <jobol@nonadev.net>
|
||||
Author: José Bollo <jose.bollo@iot.bzh>
|
||||
|
||||
https://gitlab.com/jobol/mustach
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
*/
|
||||
|
||||
|
||||
|
||||
#define MUSTACH_OK 0
|
||||
#define MUSTACH_ERROR_SYSTEM -1
|
||||
#define MUSTACH_ERROR_UNEXPECTED_END -2
|
||||
#define MUSTACH_ERROR_EMPTY_TAG -3
|
||||
#define MUSTACH_ERROR_TAG_TOO_LONG -4
|
||||
#define MUSTACH_ERROR_BAD_SEPARATORS -5
|
||||
#define MUSTACH_ERROR_TOO_DEPTH -6
|
||||
#define MUSTACH_ERROR_CLOSING -7
|
||||
#define MUSTACH_ERROR_BAD_UNESCAPE_TAG -8
|
||||
|
||||
#include <cstdio>
|
||||
|
||||
|
||||
namespace nntpchan
|
||||
{
|
||||
namespace mustache
|
||||
{
|
||||
|
||||
/**
|
||||
* mustach_itf - interface for callbacks
|
||||
*
|
||||
* All of this function should return a negative value to stop
|
||||
* the mustache processing. The returned negative value will be
|
||||
* then returned to the caller of mustach as is.
|
||||
*
|
||||
* The functions enter and next should return 0 or 1.
|
||||
*
|
||||
* All other functions should normally return 0.
|
||||
*
|
||||
* @start: Starts the mustach processing of the closure
|
||||
* 'start' is optional (can be NULL)
|
||||
*
|
||||
* @put: Writes the value of 'name' to 'file' with 'escape' or not
|
||||
*
|
||||
* @enter: Enters the section of 'name' if possible.
|
||||
* Musts return 1 if entered or 0 if not entered.
|
||||
* When 1 is returned, the function 'leave' will always be called.
|
||||
* Conversely 'leave' is never called when enter returns 0 or
|
||||
* a negative value.
|
||||
* When 1 is returned, the function must activate the first
|
||||
* item of the section.
|
||||
*
|
||||
* @next: Activates the next item of the section if it exists.
|
||||
* Musts return 1 when the next item is activated.
|
||||
* Musts return 0 when there is no item to activate.
|
||||
*
|
||||
* @leave: Leaves the last entered section
|
||||
*/
|
||||
struct mustach_itf {
|
||||
int (*start)(void *closure);
|
||||
int (*put)(void *closure, const char *name, int escape, FILE *file);
|
||||
int (*enter)(void *closure, const char *name);
|
||||
int (*next)(void *closure);
|
||||
int (*leave)(void *closure);
|
||||
};
|
||||
/**
|
||||
* fmustach - Renders the mustache 'template' in 'file' for 'itf' and 'closure'.
|
||||
*
|
||||
* @template: the template string to instanciate
|
||||
* @itf: the interface to the functions that mustach calls
|
||||
* @closure: the closure to pass to functions called
|
||||
* @file: the file where to write the result
|
||||
*
|
||||
* Returns 0 in case of success, -1 with errno set in case of system error
|
||||
* a other negative value in case of error.
|
||||
*/
|
||||
int fmustach(const char *templ, struct mustach_itf *itf, void *closure, FILE *file);
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
#endif
|
||||
44
contrib/backends/nntpchan-daemon/src/net.cpp
Normal file
44
contrib/backends/nntpchan-daemon/src/net.cpp
Normal file
@@ -0,0 +1,44 @@
|
||||
#include "net.hpp"
|
||||
#include <uv.h>
|
||||
#include <sstream>
|
||||
#include <stdexcept>
|
||||
#include <cstring>
|
||||
|
||||
namespace nntpchan
|
||||
{
|
||||
std::string NetAddr::to_string()
|
||||
{
|
||||
std::string str("invalid");
|
||||
const size_t s = 128;
|
||||
char * buff = new char[s];
|
||||
if(uv_ip6_name(&addr, buff, s) == 0) {
|
||||
str = std::string(buff);
|
||||
delete [] buff;
|
||||
}
|
||||
std::stringstream ss;
|
||||
ss << "[" << str << "]:" << ntohs(addr.sin6_port);
|
||||
return ss.str();
|
||||
}
|
||||
|
||||
NetAddr::NetAddr()
|
||||
{
|
||||
std::memset(&addr, 0, sizeof(addr));
|
||||
}
|
||||
|
||||
NetAddr ParseAddr(const std::string & addr)
|
||||
{
|
||||
NetAddr saddr;
|
||||
auto n = addr.rfind("]:");
|
||||
if (n == std::string::npos) {
|
||||
throw std::runtime_error("invalid address: "+addr);
|
||||
}
|
||||
if (addr[0] != '[') {
|
||||
throw std::runtime_error("invalid address: "+addr);
|
||||
}
|
||||
auto p = addr.substr(n+2);
|
||||
int port = std::atoi(p.c_str());
|
||||
auto a = addr.substr(0, n);
|
||||
uv_ip6_addr(a.c_str(), port, &saddr.addr);
|
||||
return saddr;
|
||||
}
|
||||
}
|
||||
23
contrib/backends/nntpchan-daemon/src/net.hpp
Normal file
23
contrib/backends/nntpchan-daemon/src/net.hpp
Normal file
@@ -0,0 +1,23 @@
|
||||
#ifndef NNTPCHAN_NET_HPP
|
||||
#define NNTPCHAN_NET_HPP
|
||||
|
||||
#include <sys/types.h>
|
||||
#include <netinet/in.h>
|
||||
#include <string>
|
||||
|
||||
namespace nntpchan
|
||||
{
|
||||
struct NetAddr
|
||||
{
|
||||
NetAddr();
|
||||
|
||||
sockaddr_in6 addr;
|
||||
operator sockaddr * () { return (sockaddr *) &addr; }
|
||||
operator const sockaddr * () const { return (sockaddr *) &addr; }
|
||||
std::string to_string();
|
||||
};
|
||||
|
||||
NetAddr ParseAddr(const std::string & addr);
|
||||
}
|
||||
|
||||
#endif
|
||||
99
contrib/backends/nntpchan-daemon/src/nntp_auth.cpp
Normal file
99
contrib/backends/nntpchan-daemon/src/nntp_auth.cpp
Normal file
@@ -0,0 +1,99 @@
|
||||
#include "nntp_auth.hpp"
|
||||
#include "crypto.hpp"
|
||||
#include "base64.hpp"
|
||||
#include <array>
|
||||
#include <iostream>
|
||||
#include <fstream>
|
||||
|
||||
namespace nntpchan
|
||||
{
|
||||
HashedCredDB::HashedCredDB() : LineReader(1024) {}
|
||||
|
||||
bool HashedCredDB::CheckLogin(const std::string & user, const std::string & passwd)
|
||||
{
|
||||
std::unique_lock<std::mutex> lock(m_access);
|
||||
m_found = false;
|
||||
m_user = user;
|
||||
m_passwd = passwd;
|
||||
m_instream->seekg(0, std::ios::end);
|
||||
const auto l = m_instream->tellg();
|
||||
m_instream->seekg(0, std::ios::beg);
|
||||
char * buff = new char[l];
|
||||
// read file
|
||||
m_instream->read(buff, l);
|
||||
Data(buff, l);
|
||||
delete [] buff;
|
||||
return m_found;
|
||||
}
|
||||
|
||||
bool HashedCredDB::ProcessLine(const std::string & line)
|
||||
{
|
||||
// strip comments
|
||||
auto comment = line.find("#");
|
||||
std::string part = line;
|
||||
for (; comment != std::string::npos; comment = part.find("#")) {
|
||||
if(comment)
|
||||
part = part.substr(0, comment);
|
||||
else break;
|
||||
}
|
||||
if(!part.size()) return false; // empty line after comments
|
||||
auto idx = part.find(":");
|
||||
if (idx == std::string::npos) return false; // bad format
|
||||
if (m_user != part.substr(0, idx)) return false; // username mismatch
|
||||
part = part.substr(idx+1);
|
||||
|
||||
idx = part.find(":");
|
||||
if (idx == std::string::npos) return false; // bad format
|
||||
std::string cred = part.substr(0, idx);
|
||||
std::string salt = part.substr(idx+1);
|
||||
return Hash(m_passwd, salt) == cred;
|
||||
}
|
||||
|
||||
void HashedCredDB::HandleLine(const std::string &line)
|
||||
{
|
||||
if(m_found) return;
|
||||
if(ProcessLine(line))
|
||||
m_found = true;
|
||||
}
|
||||
|
||||
void HashedCredDB::SetStream(std::istream * s)
|
||||
{
|
||||
m_instream = s;
|
||||
}
|
||||
|
||||
std::string HashedCredDB::Hash(const std::string & data, const std::string & salt)
|
||||
{
|
||||
SHA512Digest h;
|
||||
std::string d = data + salt;
|
||||
SHA512((const uint8_t*)d.c_str(), d.size(), h);
|
||||
return B64Encode(h.data(), h.size());
|
||||
}
|
||||
|
||||
HashedFileDB::HashedFileDB(const std::string & fname) :
|
||||
m_fname(fname),
|
||||
f(nullptr)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
HashedFileDB::~HashedFileDB()
|
||||
{
|
||||
}
|
||||
|
||||
void HashedFileDB::Close()
|
||||
{
|
||||
if(f.is_open())
|
||||
f.close();
|
||||
}
|
||||
|
||||
bool HashedFileDB::Open()
|
||||
{
|
||||
if(!f.is_open())
|
||||
f.open(m_fname);
|
||||
if(f.is_open()) {
|
||||
SetStream(&f);
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
}
|
||||
58
contrib/backends/nntpchan-daemon/src/nntp_auth.hpp
Normal file
58
contrib/backends/nntpchan-daemon/src/nntp_auth.hpp
Normal file
@@ -0,0 +1,58 @@
|
||||
#ifndef NNTPCHAN_NNTP_AUTH_HPP
|
||||
#define NNTPCHAN_NNTP_AUTH_HPP
|
||||
#include <string>
|
||||
#include <iostream>
|
||||
#include <fstream>
|
||||
#include <mutex>
|
||||
#include "line.hpp"
|
||||
|
||||
namespace nntpchan
|
||||
{
|
||||
/** @brief nntp credential db interface */
|
||||
class NNTPCredentialDB
|
||||
{
|
||||
public:
|
||||
/** @brief open connection to database, return false on error otherwise return true */
|
||||
virtual bool Open() = 0;
|
||||
/** @brief close connection to database */
|
||||
virtual void Close() = 0;
|
||||
/** @brief return true if username password combo is correct */
|
||||
virtual bool CheckLogin(const std::string & user, const std::string & passwd) = 0;
|
||||
virtual ~NNTPCredentialDB() {}
|
||||
};
|
||||
|
||||
/** @brief nntp credential db using hashed+salted passwords */
|
||||
class HashedCredDB : public NNTPCredentialDB, public LineReader
|
||||
{
|
||||
public:
|
||||
HashedCredDB();
|
||||
bool CheckLogin(const std::string & user, const std::string & passwd);
|
||||
protected:
|
||||
void SetStream(std::istream * i);
|
||||
|
||||
std::string Hash(const std::string & data, const std::string & salt);
|
||||
void HandleLine(const std::string & line);
|
||||
private:
|
||||
bool ProcessLine(const std::string & line);
|
||||
|
||||
std::mutex m_access;
|
||||
std::string m_user, m_passwd;
|
||||
bool m_found;
|
||||
/** return true if we have a line that matches this username / password combo */
|
||||
std::istream * m_instream;
|
||||
};
|
||||
|
||||
class HashedFileDB : public HashedCredDB
|
||||
{
|
||||
public:
|
||||
HashedFileDB(const std::string & fname);
|
||||
~HashedFileDB();
|
||||
bool Open();
|
||||
void Close();
|
||||
private:
|
||||
std::string m_fname;
|
||||
std::ifstream f;
|
||||
};
|
||||
}
|
||||
|
||||
#endif
|
||||
217
contrib/backends/nntpchan-daemon/src/nntp_handler.cpp
Normal file
217
contrib/backends/nntpchan-daemon/src/nntp_handler.cpp
Normal file
@@ -0,0 +1,217 @@
|
||||
#include "nntp_handler.hpp"
|
||||
#include "message.hpp"
|
||||
#include <algorithm>
|
||||
#include <cctype>
|
||||
#include <cstring>
|
||||
#include <string>
|
||||
#include <sstream>
|
||||
#include <iostream>
|
||||
|
||||
namespace nntpchan
|
||||
{
|
||||
NNTPServerHandler::NNTPServerHandler(const std::string & storage) :
|
||||
LineReader(1024),
|
||||
m_article(nullptr),
|
||||
m_auth(nullptr),
|
||||
m_store(storage),
|
||||
m_authed(false),
|
||||
m_state(eStateReadCommand)
|
||||
{
|
||||
}
|
||||
|
||||
NNTPServerHandler::~NNTPServerHandler()
|
||||
{
|
||||
if(m_auth) delete m_auth;
|
||||
}
|
||||
|
||||
void NNTPServerHandler::HandleLine(const std::string &line)
|
||||
{
|
||||
if(m_state == eStateReadCommand)
|
||||
{
|
||||
std::deque<std::string> command;
|
||||
std::istringstream s;
|
||||
s.str(line);
|
||||
for (std::string part; std::getline(s, part, ' '); ) {
|
||||
if(part.size()) command.push_back(std::string(part));
|
||||
}
|
||||
if(command.size())
|
||||
HandleCommand(command);
|
||||
else
|
||||
QueueLine("501 Syntax error");
|
||||
}
|
||||
else if(m_state == eStateStoreArticle)
|
||||
{
|
||||
std::string l = line + "\r\n";
|
||||
OnData(l.c_str(), l.size());
|
||||
}
|
||||
else
|
||||
{
|
||||
std::cerr << "invalid state" << std::endl;
|
||||
}
|
||||
}
|
||||
|
||||
void NNTPServerHandler::OnData(const char * data, ssize_t l)
|
||||
{
|
||||
if(l <= 0 ) return;
|
||||
if(m_state == eStateStoreArticle)
|
||||
{
|
||||
const char * end = strstr(data, "\r\n.\r\n");
|
||||
if(end)
|
||||
{
|
||||
std::size_t diff = end - data ;
|
||||
if(m_article)
|
||||
m_article->write(data, diff+2);
|
||||
ArticleObtained();
|
||||
diff += 5;
|
||||
Data(end+5, l-diff);
|
||||
return;
|
||||
}
|
||||
if(m_article)
|
||||
m_article->write(data, l);
|
||||
}
|
||||
else
|
||||
Data(data, l);
|
||||
}
|
||||
|
||||
void NNTPServerHandler::HandleCommand(const std::deque<std::string> & command)
|
||||
{
|
||||
auto cmd = command[0];
|
||||
std::transform(cmd.begin(), cmd.end(), cmd.begin(), ::toupper);
|
||||
std::size_t cmdlen = command.size();
|
||||
for(const auto & part : command)
|
||||
std::cerr << " " << part;
|
||||
std::cerr << std::endl;
|
||||
if (cmd == "QUIT") {
|
||||
Quit();
|
||||
return;
|
||||
}
|
||||
else if (cmd[0] == '5')
|
||||
{
|
||||
return;
|
||||
}
|
||||
else if (cmd == "MODE" ) {
|
||||
if(cmdlen == 2) {
|
||||
// set mode
|
||||
SwitchMode(command[1]);
|
||||
} else if(cmdlen) {
|
||||
// too many arguments
|
||||
QueueLine("500 too many arguments");
|
||||
} else {
|
||||
// get mode
|
||||
QueueLine("500 wrong arguments");
|
||||
}
|
||||
} else if(cmd == "CAPABILITIES") {
|
||||
QueueLine("101 I support the following:");
|
||||
QueueLine("READER");
|
||||
QueueLine("IMPLEMENTATION nntpchan-daemon");
|
||||
QueueLine("VERSION 2");
|
||||
QueueLine("STREAMING");
|
||||
QueueLine(".");
|
||||
} else if (cmd == "CHECK") {
|
||||
if(cmdlen == 2) {
|
||||
const std::string & msgid = command[1];
|
||||
if(IsValidMessageID(msgid) && m_store.Accept(msgid))
|
||||
{
|
||||
QueueLine("238 "+msgid);
|
||||
return;
|
||||
}
|
||||
QueueLine("438 "+msgid);
|
||||
}
|
||||
else
|
||||
QueueLine("501 syntax error");
|
||||
} else if (cmd == "TAKETHIS") {
|
||||
if (cmdlen == 2)
|
||||
{
|
||||
const std::string & msgid = command[1];
|
||||
if(m_store.Accept(msgid))
|
||||
{
|
||||
m_article = m_store.OpenWrite(msgid);
|
||||
}
|
||||
m_articleName = msgid;
|
||||
EnterState(eStateStoreArticle);
|
||||
return;
|
||||
}
|
||||
QueueLine("501 invalid syntax");
|
||||
} else {
|
||||
// unknown command
|
||||
QueueLine("500 Unknown Command");
|
||||
}
|
||||
}
|
||||
|
||||
void NNTPServerHandler::ArticleObtained()
|
||||
{
|
||||
if(m_article)
|
||||
{
|
||||
m_article->flush();
|
||||
m_article->close();
|
||||
delete m_article;
|
||||
m_article = nullptr;
|
||||
QueueLine("239 "+m_articleName);
|
||||
std::cerr << "stored " << m_articleName << std::endl;
|
||||
}
|
||||
else
|
||||
QueueLine("439 "+m_articleName);
|
||||
m_articleName = "";
|
||||
EnterState(eStateReadCommand);
|
||||
}
|
||||
|
||||
void NNTPServerHandler::SwitchMode(const std::string & mode)
|
||||
{
|
||||
std::string m = mode;
|
||||
std::transform(m.begin(), m.end(), m.begin(), ::toupper);
|
||||
if (m == "READER") {
|
||||
m_mode = m;
|
||||
if(PostingAllowed()) {
|
||||
QueueLine("200 Posting is permitted yo");
|
||||
} else {
|
||||
QueueLine("201 Posting is not permitted yo");
|
||||
}
|
||||
} else if (m == "STREAM") {
|
||||
m_mode = m;
|
||||
if (PostingAllowed()) {
|
||||
QueueLine("203 Streaming enabled");
|
||||
} else {
|
||||
QueueLine("483 Streaming Denied");
|
||||
}
|
||||
} else {
|
||||
// unknown mode
|
||||
QueueLine("500 Unknown mode");
|
||||
}
|
||||
}
|
||||
|
||||
void NNTPServerHandler::EnterState(State st)
|
||||
{
|
||||
std::cerr << "enter state " << st << std::endl;
|
||||
m_state = st;
|
||||
}
|
||||
|
||||
void NNTPServerHandler::Quit()
|
||||
{
|
||||
EnterState(eStateQuit);
|
||||
QueueLine("205 quitting");
|
||||
}
|
||||
|
||||
bool NNTPServerHandler::ShouldClose()
|
||||
{
|
||||
return m_state == eStateQuit;
|
||||
}
|
||||
|
||||
bool NNTPServerHandler::PostingAllowed()
|
||||
{
|
||||
return m_authed || m_auth == nullptr;
|
||||
}
|
||||
|
||||
void NNTPServerHandler::Greet()
|
||||
{
|
||||
if(PostingAllowed())
|
||||
QueueLine("200 Posting allowed");
|
||||
else
|
||||
QueueLine("201 Posting not allowed");
|
||||
}
|
||||
|
||||
void NNTPServerHandler::SetAuth(NNTPCredentialDB *creds)
|
||||
{
|
||||
if(m_auth) delete m_auth;
|
||||
m_auth = creds;
|
||||
}
|
||||
}
|
||||
62
contrib/backends/nntpchan-daemon/src/nntp_handler.hpp
Normal file
62
contrib/backends/nntpchan-daemon/src/nntp_handler.hpp
Normal file
@@ -0,0 +1,62 @@
|
||||
#ifndef NNTPCHAN_NNTP_HANDLER_HPP
|
||||
#define NNTPCHAN_NNTP_HANDLER_HPP
|
||||
#include <deque>
|
||||
#include <string>
|
||||
#include "line.hpp"
|
||||
#include "nntp_auth.hpp"
|
||||
#include "storage.hpp"
|
||||
|
||||
namespace nntpchan
|
||||
{
|
||||
class NNTPServerHandler : public LineReader, public IConnHandler
|
||||
{
|
||||
public:
|
||||
NNTPServerHandler(const std::string & storage);
|
||||
~NNTPServerHandler();
|
||||
|
||||
virtual bool ShouldClose();
|
||||
|
||||
void SetAuth(NNTPCredentialDB * creds);
|
||||
|
||||
virtual void OnData(const char *, ssize_t);
|
||||
|
||||
void Greet();
|
||||
|
||||
protected:
|
||||
void HandleLine(const std::string & line);
|
||||
void HandleCommand(const std::deque<std::string> & command);
|
||||
private:
|
||||
|
||||
enum State {
|
||||
eStateReadCommand,
|
||||
eStateStoreArticle,
|
||||
eStateQuit
|
||||
};
|
||||
|
||||
private:
|
||||
|
||||
void EnterState(State st);
|
||||
|
||||
void ArticleObtained();
|
||||
|
||||
// handle quit command, this queues a reply
|
||||
void Quit();
|
||||
|
||||
// switch nntp modes, this queues a reply
|
||||
void SwitchMode(const std::string & mode);
|
||||
|
||||
bool PostingAllowed();
|
||||
|
||||
private:
|
||||
std::string m_articleName;
|
||||
std::fstream * m_article;
|
||||
NNTPCredentialDB * m_auth;
|
||||
ArticleStorage m_store;
|
||||
std::string m_mode;
|
||||
bool m_authed;
|
||||
State m_state;
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
#endif
|
||||
87
contrib/backends/nntpchan-daemon/src/nntp_server.cpp
Normal file
87
contrib/backends/nntpchan-daemon/src/nntp_server.cpp
Normal file
@@ -0,0 +1,87 @@
|
||||
|
||||
#include "nntp_server.hpp"
|
||||
#include "nntp_auth.hpp"
|
||||
#include "nntp_handler.hpp"
|
||||
#include "net.hpp"
|
||||
#include <cassert>
|
||||
#include <iostream>
|
||||
#include <sstream>
|
||||
|
||||
namespace nntpchan
|
||||
{
|
||||
|
||||
NNTPServer::NNTPServer(uv_loop_t * loop) : Server(loop), m_frontend(nullptr) {}
|
||||
|
||||
NNTPServer::~NNTPServer()
|
||||
{
|
||||
if (m_frontend) delete m_frontend;
|
||||
}
|
||||
|
||||
IServerConn * NNTPServer::CreateConn(uv_stream_t * s)
|
||||
{
|
||||
NNTPCredentialDB * creds = nullptr;
|
||||
|
||||
std::ifstream i;
|
||||
i.open(m_logindbpath);
|
||||
if(i.is_open()) creds = new HashedFileDB(m_logindbpath);
|
||||
|
||||
NNTPServerHandler * handler = new NNTPServerHandler(m_storagePath);
|
||||
if(creds)
|
||||
handler->SetAuth(creds);
|
||||
|
||||
NNTPServerConn * conn = new NNTPServerConn(GetLoop(), s, this, handler);
|
||||
return conn;
|
||||
}
|
||||
|
||||
void NNTPServer::SetLoginDB(const std::string path)
|
||||
{
|
||||
m_logindbpath = path;
|
||||
}
|
||||
|
||||
|
||||
void NNTPServer::SetStoragePath(const std::string & path)
|
||||
{
|
||||
m_storagePath = path;
|
||||
}
|
||||
|
||||
void NNTPServer::SetInstanceName(const std::string & name)
|
||||
{
|
||||
m_servername = name;
|
||||
}
|
||||
|
||||
std::string NNTPServer::InstanceName() const
|
||||
{
|
||||
return m_servername;
|
||||
}
|
||||
|
||||
void NNTPServer::SetFrontend(Frontend * f)
|
||||
{
|
||||
if(m_frontend) delete m_frontend;
|
||||
m_frontend = f;
|
||||
}
|
||||
|
||||
void NNTPServer::OnAcceptError(int status)
|
||||
{
|
||||
std::cerr << "nntpserver::accept() " << uv_strerror(status) << std::endl;
|
||||
}
|
||||
|
||||
void NNTPServerConn::SendNextReply()
|
||||
{
|
||||
IConnHandler * handler = GetHandler();
|
||||
while(handler->HasNextLine()) {
|
||||
auto line = handler->GetNextLine();
|
||||
SendString(line + "\n");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void NNTPServerConn::Greet()
|
||||
{
|
||||
IConnHandler * handler = GetHandler();
|
||||
handler->Greet();
|
||||
SendNextReply();
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
62
contrib/backends/nntpchan-daemon/src/nntp_server.hpp
Normal file
62
contrib/backends/nntpchan-daemon/src/nntp_server.hpp
Normal file
@@ -0,0 +1,62 @@
|
||||
#ifndef NNTPCHAN_NNTP_SERVER_HPP
|
||||
#define NNTPCHAN_NNTP_SERVER_HPP
|
||||
#include <uv.h>
|
||||
#include <string>
|
||||
#include <deque>
|
||||
#include "frontend.hpp"
|
||||
#include "server.hpp"
|
||||
|
||||
namespace nntpchan
|
||||
{
|
||||
|
||||
class NNTPServer : public Server
|
||||
{
|
||||
public:
|
||||
|
||||
NNTPServer(uv_loop_t * loop);
|
||||
|
||||
virtual ~NNTPServer();
|
||||
|
||||
void SetStoragePath(const std::string & path);
|
||||
|
||||
void SetLoginDB(const std::string path);
|
||||
|
||||
void SetInstanceName(const std::string & name);
|
||||
|
||||
std::string InstanceName() const;
|
||||
|
||||
void SetFrontend(Frontend * f);
|
||||
|
||||
void Close();
|
||||
|
||||
virtual IServerConn * CreateConn(uv_stream_t * s);
|
||||
|
||||
virtual void OnAcceptError(int status);
|
||||
|
||||
private:
|
||||
|
||||
std::string m_logindbpath;
|
||||
std::string m_storagePath;
|
||||
std::string m_servername;
|
||||
|
||||
Frontend * m_frontend;
|
||||
|
||||
};
|
||||
|
||||
class NNTPServerConn : public IServerConn
|
||||
{
|
||||
public:
|
||||
|
||||
NNTPServerConn(uv_loop_t * l, uv_stream_t * s, Server * parent, IConnHandler * h) : IServerConn(l, s, parent, h) {}
|
||||
|
||||
virtual bool IsTimedOut() { return false; };
|
||||
|
||||
/** @brief send next queued reply */
|
||||
virtual void SendNextReply();
|
||||
|
||||
virtual void Greet();
|
||||
|
||||
};
|
||||
}
|
||||
|
||||
#endif
|
||||
140
contrib/backends/nntpchan-daemon/src/server.cpp
Normal file
140
contrib/backends/nntpchan-daemon/src/server.cpp
Normal file
@@ -0,0 +1,140 @@
|
||||
#include "buffer.hpp"
|
||||
#include "server.hpp"
|
||||
#include "net.hpp"
|
||||
#include <cassert>
|
||||
#include <iostream>
|
||||
|
||||
namespace nntpchan
|
||||
{
|
||||
Server::Server(uv_loop_t * loop)
|
||||
{
|
||||
m_loop = loop;
|
||||
uv_tcp_init(m_loop, &m_server);
|
||||
m_server.data = this;
|
||||
}
|
||||
|
||||
void Server::Close()
|
||||
{
|
||||
std::cout << "Close server" << std::endl;
|
||||
uv_close((uv_handle_t*)&m_server, [](uv_handle_t * s) {
|
||||
Server * self = (Server*)s->data;
|
||||
if (self) delete self;
|
||||
s->data = nullptr;
|
||||
});
|
||||
}
|
||||
|
||||
void Server::Bind(const std::string & addr)
|
||||
{
|
||||
auto saddr = ParseAddr(addr);
|
||||
assert(uv_tcp_bind(*this, saddr, 0) == 0);
|
||||
auto cb = [] (uv_stream_t * s, int status) {
|
||||
Server * self = (Server *) s->data;
|
||||
self->OnAccept(s, status);
|
||||
};
|
||||
assert(uv_listen(*this, 5, cb) == 0);
|
||||
}
|
||||
|
||||
void Server::OnAccept(uv_stream_t * s, int status)
|
||||
{
|
||||
if(status < 0) {
|
||||
OnAcceptError(status);
|
||||
return;
|
||||
}
|
||||
IServerConn * conn = CreateConn(s);
|
||||
assert(conn);
|
||||
m_conns.push_back(conn);
|
||||
conn->Greet();
|
||||
}
|
||||
|
||||
void Server::RemoveConn(IServerConn * conn)
|
||||
{
|
||||
auto itr = m_conns.begin();
|
||||
while(itr != m_conns.end())
|
||||
{
|
||||
if(*itr == conn)
|
||||
itr = m_conns.erase(itr);
|
||||
else
|
||||
++itr;
|
||||
}
|
||||
}
|
||||
|
||||
void IConnHandler::QueueLine(const std::string & line)
|
||||
{
|
||||
m_sendlines.push_back(line);
|
||||
}
|
||||
|
||||
bool IConnHandler::HasNextLine()
|
||||
{
|
||||
return m_sendlines.size() > 0;
|
||||
}
|
||||
|
||||
std::string IConnHandler::GetNextLine()
|
||||
{
|
||||
std::string line = m_sendlines[0];
|
||||
m_sendlines.pop_front();
|
||||
return line;
|
||||
}
|
||||
|
||||
IServerConn::IServerConn(uv_loop_t * l, uv_stream_t * st, Server * parent, IConnHandler * h)
|
||||
{
|
||||
m_loop = l;
|
||||
m_parent = parent;
|
||||
m_handler = h;
|
||||
uv_tcp_init(l, &m_conn);
|
||||
m_conn.data = this;
|
||||
uv_accept(st, (uv_stream_t*) &m_conn);
|
||||
uv_read_start((uv_stream_t*) &m_conn, [] (uv_handle_t * h, size_t s, uv_buf_t * b) {
|
||||
IServerConn * self = (IServerConn*) h->data;
|
||||
if(self == nullptr) return;
|
||||
b->base = self->m_readbuff;
|
||||
if (s > sizeof(self->m_readbuff))
|
||||
b->len = sizeof(self->m_readbuff);
|
||||
else
|
||||
b->len = s;
|
||||
}, [] (uv_stream_t * s, ssize_t nread, const uv_buf_t * b) {
|
||||
IServerConn * self = (IServerConn*) s->data;
|
||||
if(self == nullptr) return;
|
||||
if(nread > 0) {
|
||||
self->m_handler->OnData(b->base, nread);
|
||||
self->SendNextReply();
|
||||
if(self->m_handler->ShouldClose())
|
||||
self->Close();
|
||||
} else {
|
||||
if (nread != UV_EOF) {
|
||||
std::cerr << "error in nntp server conn alloc: ";
|
||||
std::cerr << uv_strerror(nread);
|
||||
std::cerr << std::endl;
|
||||
}
|
||||
// got eof or error
|
||||
self->Close();
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
IServerConn::~IServerConn()
|
||||
{
|
||||
delete m_handler;
|
||||
}
|
||||
|
||||
void IServerConn::SendString(const std::string & str)
|
||||
{
|
||||
WriteBuffer * b = new WriteBuffer(str);
|
||||
uv_write(&b->w, (uv_stream_t*)&m_conn, &b->b, 1, [](uv_write_t * w, int status) {
|
||||
(void) status;
|
||||
WriteBuffer * wb = (WriteBuffer *) w->data;
|
||||
if(wb)
|
||||
delete wb;
|
||||
});
|
||||
}
|
||||
|
||||
void IServerConn::Close()
|
||||
{
|
||||
m_parent->RemoveConn(this);
|
||||
uv_close((uv_handle_t*)&m_conn, [] (uv_handle_t * s) {
|
||||
IServerConn * self = (IServerConn*) s->data;
|
||||
if(self)
|
||||
delete self;
|
||||
s->data = nullptr;
|
||||
});
|
||||
}
|
||||
}
|
||||
99
contrib/backends/nntpchan-daemon/src/server.hpp
Normal file
99
contrib/backends/nntpchan-daemon/src/server.hpp
Normal file
@@ -0,0 +1,99 @@
|
||||
#ifndef NNTPCHAN_SERVER_HPP
|
||||
#define NNTPCHAN_SERVER_HPP
|
||||
#include <uv.h>
|
||||
#include <deque>
|
||||
#include <functional>
|
||||
#include <string>
|
||||
|
||||
namespace nntpchan
|
||||
{
|
||||
|
||||
class Server;
|
||||
|
||||
|
||||
struct IConnHandler
|
||||
{
|
||||
|
||||
virtual ~IConnHandler() {};
|
||||
|
||||
/** got inbound data */
|
||||
virtual void OnData(const char * data, ssize_t s) = 0;
|
||||
|
||||
/** get next line of data to send */
|
||||
std::string GetNextLine();
|
||||
|
||||
/** return true if we have a line to send */
|
||||
bool HasNextLine();
|
||||
|
||||
/** return true if we should close this connection otherwise return false */
|
||||
virtual bool ShouldClose() = 0;
|
||||
|
||||
/** queue a data send */
|
||||
void QueueLine(const std::string & line);
|
||||
|
||||
virtual void Greet() = 0;
|
||||
|
||||
|
||||
private:
|
||||
std::deque<std::string> m_sendlines;
|
||||
};
|
||||
|
||||
/** server connection handler interface */
|
||||
struct IServerConn
|
||||
{
|
||||
IServerConn(uv_loop_t * l, uv_stream_t * s, Server * parent, IConnHandler * h);
|
||||
virtual ~IServerConn();
|
||||
virtual void Close();
|
||||
virtual void Greet() = 0;
|
||||
virtual void SendNextReply() = 0;
|
||||
virtual bool IsTimedOut() = 0;
|
||||
void SendString(const std::string & str);
|
||||
Server * Parent() { return m_parent; };
|
||||
IConnHandler * GetHandler() { return m_handler; };
|
||||
uv_loop_t * GetLoop() { return m_loop; };
|
||||
private:
|
||||
uv_tcp_t m_conn;
|
||||
uv_loop_t * m_loop;
|
||||
Server * m_parent;
|
||||
IConnHandler * m_handler;
|
||||
char m_readbuff[65536];
|
||||
};
|
||||
|
||||
class Server
|
||||
{
|
||||
public:
|
||||
Server(uv_loop_t * loop);
|
||||
/** called after socket close, NEVER call directly */
|
||||
virtual ~Server() {}
|
||||
/** create connection handler from open stream */
|
||||
virtual IServerConn * CreateConn(uv_stream_t * s) = 0;
|
||||
/** close all sockets and stop */
|
||||
void Close();
|
||||
/** bind to address */
|
||||
void Bind(const std::string & addr);
|
||||
|
||||
typedef std::function<void(IServerConn *)> ConnVisitor;
|
||||
|
||||
/** visit all open connections */
|
||||
void VisitConns(ConnVisitor v);
|
||||
|
||||
/** remove connection from server, called after proper close */
|
||||
void RemoveConn(IServerConn * conn);
|
||||
|
||||
protected:
|
||||
uv_loop_t * GetLoop() { return m_loop; }
|
||||
virtual void OnAcceptError(int status) = 0;
|
||||
private:
|
||||
operator uv_handle_t * () { return (uv_handle_t*) &m_server; }
|
||||
operator uv_tcp_t * () { return &m_server; }
|
||||
operator uv_stream_t * () { return (uv_stream_t *) &m_server; }
|
||||
|
||||
void OnAccept(uv_stream_t * s, int status);
|
||||
std::deque<IServerConn *> m_conns;
|
||||
uv_tcp_t m_server;
|
||||
uv_loop_t * m_loop;
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
#endif
|
||||
59
contrib/backends/nntpchan-daemon/src/storage.cpp
Normal file
59
contrib/backends/nntpchan-daemon/src/storage.cpp
Normal file
@@ -0,0 +1,59 @@
|
||||
#include "storage.hpp"
|
||||
#include <errno.h>
|
||||
#include <sys/stat.h>
|
||||
#include <sstream>
|
||||
|
||||
namespace nntpchan
|
||||
{
|
||||
ArticleStorage::ArticleStorage()
|
||||
{
|
||||
}
|
||||
|
||||
ArticleStorage::ArticleStorage(const std::string & fpath) {
|
||||
SetPath(fpath);
|
||||
}
|
||||
|
||||
ArticleStorage::~ArticleStorage()
|
||||
{
|
||||
}
|
||||
|
||||
void ArticleStorage::SetPath(const std::string & fpath)
|
||||
{
|
||||
basedir = fpath;
|
||||
// quiet fail
|
||||
// TODO: check for errors
|
||||
mkdir(basedir.c_str(), 0700);
|
||||
}
|
||||
|
||||
bool ArticleStorage::Accept(const std::string& msgid)
|
||||
{
|
||||
if (!IsValidMessageID(msgid)) return false;
|
||||
auto s = MessagePath(msgid);
|
||||
FILE * f = fopen(s.c_str(), "r");
|
||||
if ( f == nullptr) return errno == ENOENT;
|
||||
fclose(f);
|
||||
return false;
|
||||
}
|
||||
|
||||
std::string ArticleStorage::MessagePath(const std::string & msgid)
|
||||
{
|
||||
return basedir + GetPathSep() + msgid;
|
||||
}
|
||||
|
||||
std::fstream * ArticleStorage::OpenRead(const std::string & msgid)
|
||||
{
|
||||
return OpenMode(msgid, std::ios::in);
|
||||
}
|
||||
|
||||
std::fstream * ArticleStorage::OpenWrite(const std::string & msgid)
|
||||
{
|
||||
return OpenMode(msgid, std::ios::out);
|
||||
}
|
||||
|
||||
char ArticleStorage::GetPathSep()
|
||||
{
|
||||
return '/';
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
55
contrib/backends/nntpchan-daemon/src/storage.hpp
Normal file
55
contrib/backends/nntpchan-daemon/src/storage.hpp
Normal file
@@ -0,0 +1,55 @@
|
||||
#ifndef NNTPCHAN_STORAGE_HPP
|
||||
#define NNTPCHAN_STORAGE_HPP
|
||||
|
||||
#include <fstream>
|
||||
#include <string>
|
||||
#include "message.hpp"
|
||||
|
||||
namespace nntpchan
|
||||
{
|
||||
class ArticleStorage
|
||||
{
|
||||
public:
|
||||
ArticleStorage();
|
||||
ArticleStorage(const std::string & fpath);
|
||||
~ArticleStorage();
|
||||
|
||||
void SetPath(const std::string & fpath);
|
||||
|
||||
std::fstream * OpenWrite(const std::string & msgid);
|
||||
std::fstream * OpenRead(const std::string & msgid);
|
||||
|
||||
/**
|
||||
return true if we should accept a new message give its message id
|
||||
*/
|
||||
bool Accept(const std::string & msgid);
|
||||
|
||||
private:
|
||||
|
||||
template<typename Mode>
|
||||
std::fstream * OpenMode(const std::string & msgid, const Mode & m)
|
||||
{
|
||||
if(IsValidMessageID(msgid))
|
||||
{
|
||||
std::fstream * f = new std::fstream;
|
||||
f->open(MessagePath(msgid), m);
|
||||
if(f->is_open())
|
||||
return f;
|
||||
delete f;
|
||||
return nullptr;
|
||||
}
|
||||
else
|
||||
return nullptr;
|
||||
};
|
||||
|
||||
std::string MessagePath(const std::string & msgid);
|
||||
|
||||
static char GetPathSep();
|
||||
|
||||
std::string basedir;
|
||||
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
#endif
|
||||
13
contrib/backends/nntpchan-daemon/test.cpp
Normal file
13
contrib/backends/nntpchan-daemon/test.cpp
Normal file
@@ -0,0 +1,13 @@
|
||||
#include "exec_frontend.hpp"
|
||||
#include <cassert>
|
||||
#include <iostream>
|
||||
|
||||
|
||||
|
||||
int main(int , char * [])
|
||||
{
|
||||
nntpchan::Frontend * f = new nntpchan::ExecFrontend("./contrib/nntpchan.sh");
|
||||
assert(f->AcceptsMessage("<test@server>"));
|
||||
assert(f->AcceptsNewsgroup("overchan.test"));
|
||||
std::cout << "all good" << std::endl;
|
||||
}
|
||||
92
contrib/backends/nntpchan-daemon/tools/authtool.cpp
Normal file
92
contrib/backends/nntpchan-daemon/tools/authtool.cpp
Normal file
@@ -0,0 +1,92 @@
|
||||
#include "base64.hpp"
|
||||
#include "crypto.hpp"
|
||||
|
||||
#include <cassert>
|
||||
#include <cstring>
|
||||
#include <string>
|
||||
#include <iostream>
|
||||
#include <sodium.h>
|
||||
|
||||
static void print_help(const std::string & exename)
|
||||
{
|
||||
std::cout << "usage: " << exename << " [help|gen|check]" << std::endl;
|
||||
}
|
||||
|
||||
static void print_long_help()
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
static void gen_passwd(const std::string & username, const std::string & passwd)
|
||||
{
|
||||
std::array<uint8_t, 8> random;
|
||||
randombytes_buf(random.data(), random.size());
|
||||
std::string salt = nntpchan::B64Encode(random.data(), random.size());
|
||||
std::string cred = passwd + salt;
|
||||
nntpchan::SHA512Digest d;
|
||||
nntpchan::SHA512((const uint8_t *)cred.c_str(), cred.size(), d);
|
||||
std::string hash = nntpchan::B64Encode(d.data(), d.size());
|
||||
std::cout << username << ":" << hash << ":" << salt << std::endl;
|
||||
}
|
||||
|
||||
|
||||
static bool check_cred(const std::string & cred, const std::string & passwd)
|
||||
{
|
||||
auto idx = cred.find(":");
|
||||
if(idx == std::string::npos || idx == 0) return false;
|
||||
std::string part = cred.substr(idx+1);
|
||||
idx = part.find(":");
|
||||
if(idx == std::string::npos || idx == 0) return false;
|
||||
std::string salt = part.substr(idx+1);
|
||||
std::string hash = part.substr(0, idx);
|
||||
std::vector<uint8_t> h;
|
||||
if(!nntpchan::B64Decode(hash, h)) return false;
|
||||
nntpchan::SHA512Digest d;
|
||||
std::string l = passwd + salt;
|
||||
nntpchan::SHA512((const uint8_t*)l.data(), l.size(), d);
|
||||
return std::memcmp(h.data(), d.data(), d.size()) == 0;
|
||||
}
|
||||
|
||||
int main(int argc, char * argv[])
|
||||
{
|
||||
assert(sodium_init() == 0);
|
||||
if(argc == 1) {
|
||||
print_help(argv[0]);
|
||||
return 1;
|
||||
}
|
||||
std::string cmd(argv[1]);
|
||||
if (cmd == "help") {
|
||||
print_long_help();
|
||||
return 0;
|
||||
}
|
||||
if (cmd == "gen") {
|
||||
if(argc == 4) {
|
||||
gen_passwd(argv[2], argv[3]);
|
||||
return 0;
|
||||
} else {
|
||||
std::cout << "usage: " << argv[0] << " gen username password" << std::endl;
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
if(cmd == "check" ) {
|
||||
std::string cred;
|
||||
std::cout << "credential: " ;
|
||||
if(!std::getline(std::cin, cred)) {
|
||||
return 1;
|
||||
}
|
||||
std::string passwd;
|
||||
std::cout << "password: ";
|
||||
if(!std::getline(std::cin, passwd)) {
|
||||
return 1;
|
||||
}
|
||||
if(check_cred(cred, passwd)) {
|
||||
std::cout << "okay" << std::endl;
|
||||
return 0;
|
||||
}
|
||||
std::cout << "bad login" << std::endl;
|
||||
return 1;
|
||||
}
|
||||
|
||||
print_help(argv[0]);
|
||||
return 1;
|
||||
}
|
||||
14
contrib/backends/nntpchan-daemon/tools/testtool.cpp
Normal file
14
contrib/backends/nntpchan-daemon/tools/testtool.cpp
Normal file
@@ -0,0 +1,14 @@
|
||||
#include "exec_frontend.hpp"
|
||||
#include "message.hpp"
|
||||
#include <cassert>
|
||||
#include <iostream>
|
||||
|
||||
|
||||
|
||||
int main(int , char * [])
|
||||
{
|
||||
nntpchan::Frontend * f = new nntpchan::ExecFrontend("./contrib/nntpchan.sh");
|
||||
assert(nntpchan::IsValidMessageID("<a28a71493831188@web.oniichan.onion>"));
|
||||
assert(f->AcceptsNewsgroup("overchan.test"));
|
||||
std::cout << "all good" << std::endl;
|
||||
}
|
||||
8
contrib/backends/nntpchand/.dir-locals.el
Normal file
8
contrib/backends/nntpchand/.dir-locals.el
Normal file
@@ -0,0 +1,8 @@
|
||||
;; thanks stack overflow
|
||||
;; https://stackoverflow.com/questions/4012321/how-can-i-access-the-path-to-the-current-directory-in-an-emacs-directory-variabl
|
||||
((nil . ((eval . (set (make-local-variable 'my-project-path)
|
||||
(file-name-directory
|
||||
(let ((d (dir-locals-find-file ".")))
|
||||
(if (stringp d) d (car d))))))
|
||||
(eval . (setenv "GOPATH" my-project-path))
|
||||
(eval . (message "Project directory set to `%s'." my-project-path)))))
|
||||
1
contrib/backends/nntpchand/.gitignore
vendored
Normal file
1
contrib/backends/nntpchand/.gitignore
vendored
Normal file
@@ -0,0 +1 @@
|
||||
nntpchand
|
||||
11
contrib/backends/nntpchand/Makefile
Normal file
11
contrib/backends/nntpchand/Makefile
Normal file
@@ -0,0 +1,11 @@
|
||||
REPO=$(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
|
||||
|
||||
all: clean build
|
||||
|
||||
build: nntpchand
|
||||
|
||||
nntpchand:
|
||||
GOPATH=$(REPO) go build -v
|
||||
|
||||
clean:
|
||||
GOPATH=$(REPO) go clean -v
|
||||
@@ -0,0 +1,11 @@
|
||||
<!doctype html>
|
||||
<html>
|
||||
|
||||
<head>
|
||||
<title> Error </title>
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<pre> {{ .Error}} </pre>
|
||||
</body>
|
||||
</html>
|
||||
@@ -0,0 +1,11 @@
|
||||
<!doctype html>
|
||||
<html>
|
||||
|
||||
<head>
|
||||
<title> Overchan </title>
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<pre>ebin</pre>
|
||||
</body>
|
||||
</html>
|
||||
9
contrib/backends/nntpchand/main.go
Normal file
9
contrib/backends/nntpchand/main.go
Normal file
@@ -0,0 +1,9 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
"nntpchan/cmd/nntpchan"
|
||||
)
|
||||
|
||||
func main() {
|
||||
nntpchan.Main()
|
||||
}
|
||||
175
contrib/backends/nntpchand/src/nntpchan/cmd/nntpchan/main.go
Normal file
175
contrib/backends/nntpchand/src/nntpchan/cmd/nntpchan/main.go
Normal file
@@ -0,0 +1,175 @@
|
||||
package nntpchan
|
||||
|
||||
import (
|
||||
log "github.com/Sirupsen/logrus"
|
||||
"net"
|
||||
_ "net/http/pprof"
|
||||
"nntpchan/lib/config"
|
||||
"nntpchan/lib/database"
|
||||
"nntpchan/lib/frontend"
|
||||
"nntpchan/lib/nntp"
|
||||
"nntpchan/lib/store"
|
||||
"nntpchan/lib/webhooks"
|
||||
"os"
|
||||
"os/signal"
|
||||
"syscall"
|
||||
"time"
|
||||
)
|
||||
|
||||
type runStatus struct {
|
||||
nntpListener net.Listener
|
||||
run bool
|
||||
done chan error
|
||||
}
|
||||
|
||||
func (st *runStatus) Stop() {
|
||||
st.run = false
|
||||
if st.nntpListener != nil {
|
||||
st.nntpListener.Close()
|
||||
}
|
||||
st.nntpListener = nil
|
||||
log.Info("stopping daemon process")
|
||||
}
|
||||
|
||||
func Main() {
|
||||
st := &runStatus{
|
||||
run: true,
|
||||
done: make(chan error),
|
||||
}
|
||||
log.Info("starting up nntpchan...")
|
||||
cfgFname := "nntpchan.json"
|
||||
conf, err := config.Ensure(cfgFname)
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
|
||||
if conf.Log == "debug" {
|
||||
log.SetLevel(log.DebugLevel)
|
||||
}
|
||||
|
||||
sconfig := conf.Store
|
||||
|
||||
if sconfig == nil {
|
||||
log.Fatal("no article storage configured")
|
||||
}
|
||||
|
||||
nconfig := conf.NNTP
|
||||
|
||||
if nconfig == nil {
|
||||
log.Fatal("no nntp server configured")
|
||||
}
|
||||
|
||||
dconfig := conf.Database
|
||||
|
||||
if dconfig == nil {
|
||||
log.Fatal("no database configured")
|
||||
}
|
||||
|
||||
// create nntp server
|
||||
nserv := nntp.NewServer()
|
||||
nserv.Config = nconfig
|
||||
nserv.Feeds = conf.Feeds
|
||||
|
||||
if nconfig.LoginsFile != "" {
|
||||
nserv.Auth = nntp.FlatfileAuth(nconfig.LoginsFile)
|
||||
}
|
||||
|
||||
// create article storage
|
||||
nserv.Storage, err = store.NewFilesytemStorage(sconfig.Path, true)
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
|
||||
if conf.WebHooks != nil && len(conf.WebHooks) > 0 {
|
||||
// put webhooks into nntp server event hooks
|
||||
nserv.Hooks = webhooks.NewWebhooks(conf.WebHooks, nserv.Storage)
|
||||
}
|
||||
|
||||
if conf.NNTPHooks != nil && len(conf.NNTPHooks) > 0 {
|
||||
var hooks nntp.MulitHook
|
||||
if nserv.Hooks != nil {
|
||||
hooks = append(hooks, nserv.Hooks)
|
||||
}
|
||||
for _, h := range conf.NNTPHooks {
|
||||
hooks = append(hooks, nntp.NewHook(h))
|
||||
}
|
||||
nserv.Hooks = hooks
|
||||
}
|
||||
var frontends []frontend.Frontend
|
||||
var db database.Database
|
||||
for _, fconf := range conf.Frontends {
|
||||
var f frontend.Frontend
|
||||
f, err = frontend.NewHTTPFrontend(&fconf, db, nserv.Storage)
|
||||
if err == nil {
|
||||
log.Infof("serving frontend %s", f.Name())
|
||||
go f.Serve()
|
||||
frontends = append(frontends, f)
|
||||
} else {
|
||||
log.Fatalf("failed to set up frontend %s: %s", fconf.Name(), err.Error())
|
||||
}
|
||||
}
|
||||
|
||||
// start persisting feeds
|
||||
go nserv.PersistFeeds()
|
||||
|
||||
// handle signals
|
||||
sigchnl := make(chan os.Signal, 1)
|
||||
signal.Notify(sigchnl, syscall.SIGHUP, os.Interrupt)
|
||||
go func() {
|
||||
for {
|
||||
s := <-sigchnl
|
||||
if s == syscall.SIGHUP {
|
||||
// handle SIGHUP
|
||||
conf, err := config.Ensure(cfgFname)
|
||||
if err == nil {
|
||||
log.Infof("reloading config: %s", cfgFname)
|
||||
nserv.ReloadServer(conf.NNTP)
|
||||
nserv.ReloadFeeds(conf.Feeds)
|
||||
nserv.ReloadStorage(conf.Store)
|
||||
for idx := range frontends {
|
||||
f := frontends[idx]
|
||||
for i := range conf.Frontends {
|
||||
c := conf.Frontends[i]
|
||||
if c.Name() == f.Name() {
|
||||
// TODO: inject storage config?
|
||||
f.Reload(&c)
|
||||
}
|
||||
}
|
||||
}
|
||||
} else {
|
||||
log.Errorf("failed to reload config: %s", err)
|
||||
}
|
||||
} else if s == os.Interrupt {
|
||||
// handle interrupted, clean close
|
||||
st.Stop()
|
||||
return
|
||||
}
|
||||
}
|
||||
}()
|
||||
go func() {
|
||||
var err error
|
||||
for st.run {
|
||||
var nl net.Listener
|
||||
naddr := conf.NNTP.Bind
|
||||
log.Infof("Bind nntp server to %s", naddr)
|
||||
nl, err = net.Listen("tcp", naddr)
|
||||
if err == nil {
|
||||
st.nntpListener = nl
|
||||
err = nserv.Serve(nl)
|
||||
if err != nil {
|
||||
nl.Close()
|
||||
log.Errorf("nntpserver.serve() %s", err.Error())
|
||||
}
|
||||
} else {
|
||||
log.Errorf("nntp server net.Listen failed: %s", err.Error())
|
||||
}
|
||||
time.Sleep(time.Second)
|
||||
}
|
||||
st.done <- err
|
||||
}()
|
||||
e := <-st.done
|
||||
if e != nil {
|
||||
log.Fatal(e)
|
||||
}
|
||||
log.Info("ended")
|
||||
}
|
||||
@@ -0,0 +1,42 @@
|
||||
package main
|
||||
|
||||
// simple nntp server
|
||||
|
||||
import (
|
||||
log "github.com/Sirupsen/logrus"
|
||||
"github.com/majestrate/srndv2/lib/config"
|
||||
"github.com/majestrate/srndv2/lib/nntp"
|
||||
"github.com/majestrate/srndv2/lib/store"
|
||||
"net"
|
||||
)
|
||||
|
||||
func main() {
|
||||
|
||||
log.Info("starting NNTP server...")
|
||||
conf, err := config.Ensure("settings.json")
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
|
||||
if conf.Log == "debug" {
|
||||
log.SetLevel(log.DebugLevel)
|
||||
}
|
||||
|
||||
serv := &nntp.Server{
|
||||
Config: conf.NNTP,
|
||||
Feeds: conf.Feeds,
|
||||
}
|
||||
serv.Storage, err = store.NewFilesytemStorage(conf.Store.Path, false)
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
l, err := net.Listen("tcp", conf.NNTP.Bind)
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
log.Info("listening on ", l.Addr())
|
||||
err = serv.Serve(l)
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
}
|
||||
4
contrib/backends/nntpchand/src/nntpchan/lib/admin/doc.go
Normal file
4
contrib/backends/nntpchand/src/nntpchan/lib/admin/doc.go
Normal file
@@ -0,0 +1,4 @@
|
||||
//
|
||||
// server admin panel
|
||||
//
|
||||
package admin
|
||||
16
contrib/backends/nntpchand/src/nntpchan/lib/admin/server.go
Normal file
16
contrib/backends/nntpchand/src/nntpchan/lib/admin/server.go
Normal file
@@ -0,0 +1,16 @@
|
||||
package admin
|
||||
|
||||
import (
|
||||
"net/http"
|
||||
)
|
||||
|
||||
type Server struct {
|
||||
}
|
||||
|
||||
func (s *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
|
||||
|
||||
}
|
||||
|
||||
func NewServer() *Server {
|
||||
return &Server{}
|
||||
}
|
||||
10
contrib/backends/nntpchand/src/nntpchan/lib/api/api.go
Normal file
10
contrib/backends/nntpchand/src/nntpchan/lib/api/api.go
Normal file
@@ -0,0 +1,10 @@
|
||||
package api
|
||||
|
||||
import (
|
||||
"nntpchan/lib/model"
|
||||
)
|
||||
|
||||
// json api
|
||||
type API interface {
|
||||
MakePost(p model.Post)
|
||||
}
|
||||
2
contrib/backends/nntpchand/src/nntpchan/lib/api/doc.go
Normal file
2
contrib/backends/nntpchand/src/nntpchan/lib/api/doc.go
Normal file
@@ -0,0 +1,2 @@
|
||||
// json api
|
||||
package api
|
||||
20
contrib/backends/nntpchand/src/nntpchan/lib/api/server.go
Normal file
20
contrib/backends/nntpchand/src/nntpchan/lib/api/server.go
Normal file
@@ -0,0 +1,20 @@
|
||||
package api
|
||||
|
||||
import (
|
||||
"github.com/gorilla/mux"
|
||||
"net/http"
|
||||
)
|
||||
|
||||
// api server
|
||||
type Server struct {
|
||||
}
|
||||
|
||||
func (s *Server) HandlePing(w http.ResponseWriter, r *http.Request) {
|
||||
|
||||
}
|
||||
|
||||
// inject api routes
|
||||
func (s *Server) SetupRoutes(r *mux.Router) {
|
||||
// setup api pinger
|
||||
r.Path("/ping").HandlerFunc(s.HandlePing)
|
||||
}
|
||||
@@ -0,0 +1,73 @@
|
||||
package config
|
||||
|
||||
import "regexp"
|
||||
|
||||
// configration for local article policies
|
||||
type ArticleConfig struct {
|
||||
// explicitly allow these newsgroups (regexp)
|
||||
AllowGroups []string `json:"whitelist"`
|
||||
// explicitly disallow these newsgroups (regexp)
|
||||
DisallowGroups []string `json:"blacklist"`
|
||||
// only allow explicitly allowed groups
|
||||
ForceWhitelist bool `json:"force-whitelist"`
|
||||
// allow anonymous posts?
|
||||
AllowAnon bool `json:"anon"`
|
||||
// allow attachments?
|
||||
AllowAttachments bool `json:"attachments"`
|
||||
// allow anonymous attachments?
|
||||
AllowAnonAttachments bool `json:"anon-attachments"`
|
||||
}
|
||||
|
||||
func (c *ArticleConfig) AllowGroup(group string) bool {
|
||||
|
||||
for _, g := range c.DisallowGroups {
|
||||
r := regexp.MustCompile(g)
|
||||
if r.MatchString(group) && c.ForceWhitelist {
|
||||
// disallowed
|
||||
return false
|
||||
}
|
||||
}
|
||||
|
||||
// check allowed groups first
|
||||
for _, g := range c.AllowGroups {
|
||||
r := regexp.MustCompile(g)
|
||||
if r.MatchString(g) {
|
||||
return true
|
||||
}
|
||||
}
|
||||
|
||||
return !c.ForceWhitelist
|
||||
}
|
||||
|
||||
// allow an article?
|
||||
func (c *ArticleConfig) Allow(msgid, group string, anon, attachment bool) bool {
|
||||
|
||||
// check attachment policy
|
||||
if c.AllowGroup(group) {
|
||||
allow := true
|
||||
// no anon ?
|
||||
if anon && !c.AllowAnon {
|
||||
allow = false
|
||||
}
|
||||
// no attachments ?
|
||||
if allow && attachment && !c.AllowAttachments {
|
||||
allow = false
|
||||
}
|
||||
// no anon attachments ?
|
||||
if allow && attachment && anon && !c.AllowAnonAttachments {
|
||||
allow = false
|
||||
}
|
||||
return allow
|
||||
} else {
|
||||
return false
|
||||
}
|
||||
}
|
||||
|
||||
var DefaultArticlePolicy = ArticleConfig{
|
||||
AllowGroups: []string{"ctl", "overchan.test"},
|
||||
DisallowGroups: []string{"overchan.cp"},
|
||||
ForceWhitelist: false,
|
||||
AllowAnon: true,
|
||||
AllowAttachments: true,
|
||||
AllowAnonAttachments: false,
|
||||
}
|
||||
13
contrib/backends/nntpchand/src/nntpchan/lib/config/cache.go
Normal file
13
contrib/backends/nntpchand/src/nntpchan/lib/config/cache.go
Normal file
@@ -0,0 +1,13 @@
|
||||
package config
|
||||
|
||||
// caching interface configuration
|
||||
type CacheConfig struct {
|
||||
// backend cache driver name
|
||||
Backend string `json:"backend"`
|
||||
// address for cache
|
||||
Addr string `json:"addr"`
|
||||
// username for login
|
||||
User string `json:"user"`
|
||||
// password for login
|
||||
Password string `json:"password"`
|
||||
}
|
||||
87
contrib/backends/nntpchand/src/nntpchan/lib/config/config.go
Normal file
87
contrib/backends/nntpchand/src/nntpchan/lib/config/config.go
Normal file
@@ -0,0 +1,87 @@
|
||||
package config
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"encoding/json"
|
||||
"io/ioutil"
|
||||
"os"
|
||||
)
|
||||
|
||||
// main configuration
|
||||
type Config struct {
|
||||
// nntp server configuration
|
||||
NNTP *NNTPServerConfig `json:"nntp"`
|
||||
// log level
|
||||
Log string `json:"log"`
|
||||
// article storage config
|
||||
Store *StoreConfig `json:"storage"`
|
||||
// web hooks to call
|
||||
WebHooks []*WebhookConfig `json:"webhooks"`
|
||||
// external scripts to call
|
||||
NNTPHooks []*NNTPHookConfig `json:"nntphooks"`
|
||||
// database backend configuration
|
||||
Database *DatabaseConfig `json:"db"`
|
||||
// list of feeds to add on runtime
|
||||
Feeds []*FeedConfig `json:"feeds"`
|
||||
// frontend config
|
||||
Frontends []FrontendConfig `json:"frontends"`
|
||||
// unexported fields ...
|
||||
|
||||
// absolute filepath to configuration
|
||||
fpath string
|
||||
}
|
||||
|
||||
// default configuration
|
||||
var DefaultConfig = Config{
|
||||
Store: &DefaultStoreConfig,
|
||||
NNTP: &DefaultNNTPConfig,
|
||||
Database: &DefaultDatabaseConfig,
|
||||
WebHooks: []*WebhookConfig{DefaultWebHookConfig},
|
||||
NNTPHooks: []*NNTPHookConfig{DefaultNNTPHookConfig},
|
||||
Feeds: DefaultFeeds,
|
||||
Frontends: []FrontendConfig{DefaultFrontendConfig},
|
||||
Log: "debug",
|
||||
}
|
||||
|
||||
// reload configuration
|
||||
func (c *Config) Reload() (err error) {
|
||||
var b []byte
|
||||
b, err = ioutil.ReadFile(c.fpath)
|
||||
if err == nil {
|
||||
err = json.Unmarshal(b, c)
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
// ensure that a config file exists
|
||||
// creates one if it does not exist
|
||||
func Ensure(fname string) (cfg *Config, err error) {
|
||||
_, err = os.Stat(fname)
|
||||
if os.IsNotExist(err) {
|
||||
err = nil
|
||||
var d []byte
|
||||
d, err = json.Marshal(&DefaultConfig)
|
||||
if err == nil {
|
||||
b := new(bytes.Buffer)
|
||||
err = json.Indent(b, d, "", " ")
|
||||
if err == nil {
|
||||
err = ioutil.WriteFile(fname, b.Bytes(), 0600)
|
||||
}
|
||||
}
|
||||
}
|
||||
if err == nil {
|
||||
cfg, err = Load(fname)
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
// load configuration file
|
||||
func Load(fname string) (cfg *Config, err error) {
|
||||
cfg = new(Config)
|
||||
cfg.fpath = fname
|
||||
err = cfg.Reload()
|
||||
if err != nil {
|
||||
cfg = nil
|
||||
}
|
||||
return
|
||||
}
|
||||
@@ -0,0 +1,18 @@
|
||||
package config
|
||||
|
||||
type DatabaseConfig struct {
|
||||
// url or address for database connector
|
||||
Addr string `json:"addr"`
|
||||
// password to use
|
||||
Password string `json:"password"`
|
||||
// username to use
|
||||
Username string `json:"username"`
|
||||
// type of database to use
|
||||
Type string `json:"type"`
|
||||
}
|
||||
|
||||
var DefaultDatabaseConfig = DatabaseConfig{
|
||||
Type: "postgres",
|
||||
Addr: "/var/run/postgresql",
|
||||
Password: "",
|
||||
}
|
||||
@@ -0,0 +1,4 @@
|
||||
//
|
||||
// package for parsing config files
|
||||
//
|
||||
package config
|
||||
33
contrib/backends/nntpchand/src/nntpchan/lib/config/feed.go
Normal file
33
contrib/backends/nntpchand/src/nntpchan/lib/config/feed.go
Normal file
@@ -0,0 +1,33 @@
|
||||
package config
|
||||
|
||||
// configuration for 1 nntp feed
|
||||
type FeedConfig struct {
|
||||
// feed's policy, filters articles
|
||||
Policy *ArticleConfig `json:"policy"`
|
||||
// remote server's address
|
||||
Addr string `json:"addr"`
|
||||
// proxy server config
|
||||
Proxy *ProxyConfig `json:"proxy"`
|
||||
// nntp username to log in with
|
||||
Username string `json:"username"`
|
||||
// nntp password to use when logging in
|
||||
Password string `json:"password"`
|
||||
// do we want to use tls?
|
||||
TLS bool `json:"tls"`
|
||||
// the name of this feed
|
||||
Name string `json:"name"`
|
||||
// how often to pull articles from the server in minutes
|
||||
// 0 for never
|
||||
PullInterval int `json:"pull"`
|
||||
}
|
||||
|
||||
var DuummyFeed = FeedConfig{
|
||||
Policy: &DefaultArticlePolicy,
|
||||
Addr: "nntp.dummy.tld:1119",
|
||||
Proxy: &DefaultTorProxy,
|
||||
Name: "dummy",
|
||||
}
|
||||
|
||||
var DefaultFeeds = []*FeedConfig{
|
||||
&DuummyFeed,
|
||||
}
|
||||
@@ -0,0 +1,31 @@
|
||||
package config
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
)
|
||||
|
||||
type FrontendConfig struct {
|
||||
// bind to address
|
||||
BindAddr string `json:"bind"`
|
||||
// frontend cache
|
||||
Cache *CacheConfig `json:"cache"`
|
||||
// frontend ssl settings
|
||||
SSL *SSLSettings `json:"ssl"`
|
||||
// static files directory
|
||||
Static string `json:"static_dir"`
|
||||
// http middleware configuration
|
||||
Middleware *MiddlewareConfig `json:"middleware"`
|
||||
// storage config
|
||||
Storage *StoreConfig `json:"-"`
|
||||
}
|
||||
|
||||
func (cfg *FrontendConfig) Name() string {
|
||||
return fmt.Sprintf("frontend-%s", cfg.BindAddr)
|
||||
}
|
||||
|
||||
// default Frontend Configuration
|
||||
var DefaultFrontendConfig = FrontendConfig{
|
||||
BindAddr: "127.0.0.1:18888",
|
||||
Static: "./files/static/",
|
||||
Middleware: &DefaultMiddlewareConfig,
|
||||
}
|
||||
15
contrib/backends/nntpchand/src/nntpchan/lib/config/hook.go
Normal file
15
contrib/backends/nntpchand/src/nntpchan/lib/config/hook.go
Normal file
@@ -0,0 +1,15 @@
|
||||
package config
|
||||
|
||||
// config for external callback for nntp articles
|
||||
type NNTPHookConfig struct {
|
||||
// name of hook
|
||||
Name string `json:"name"`
|
||||
// executable script path to be called with arguments: /path/to/article
|
||||
Exec string `json:"exec"`
|
||||
}
|
||||
|
||||
// default dummy hook
|
||||
var DefaultNNTPHookConfig = &NNTPHookConfig{
|
||||
Name: "dummy",
|
||||
Exec: "/bin/true",
|
||||
}
|
||||
@@ -0,0 +1,14 @@
|
||||
package config
|
||||
|
||||
// configuration for http middleware
|
||||
type MiddlewareConfig struct {
|
||||
// middleware type, currently just 1 is available: overchan
|
||||
Type string `json:"type"`
|
||||
// directory for our html templates
|
||||
Templates string `json:"templates_dir"`
|
||||
}
|
||||
|
||||
var DefaultMiddlewareConfig = MiddlewareConfig{
|
||||
Type: "overchan",
|
||||
Templates: "./files/templates/overchan/",
|
||||
}
|
||||
24
contrib/backends/nntpchand/src/nntpchan/lib/config/nntp.go
Normal file
24
contrib/backends/nntpchand/src/nntpchan/lib/config/nntp.go
Normal file
@@ -0,0 +1,24 @@
|
||||
package config
|
||||
|
||||
type NNTPServerConfig struct {
|
||||
// address to bind to
|
||||
Bind string `json:"bind"`
|
||||
// name of the nntp server
|
||||
Name string `json:"name"`
|
||||
// default inbound article policy
|
||||
Article *ArticleConfig `json:"policy"`
|
||||
// do we allow anonymous NNTP sync?
|
||||
AnonNNTP bool `json:"anon-nntp"`
|
||||
// ssl settings for nntp
|
||||
SSL *SSLSettings
|
||||
// file with login credentials
|
||||
LoginsFile string `json:"authfile"`
|
||||
}
|
||||
|
||||
var DefaultNNTPConfig = NNTPServerConfig{
|
||||
AnonNNTP: false,
|
||||
Bind: "0.0.0.0:1119",
|
||||
Name: "nntp.server.tld",
|
||||
Article: &DefaultArticlePolicy,
|
||||
LoginsFile: "",
|
||||
}
|
||||
13
contrib/backends/nntpchand/src/nntpchan/lib/config/proxy.go
Normal file
13
contrib/backends/nntpchand/src/nntpchan/lib/config/proxy.go
Normal file
@@ -0,0 +1,13 @@
|
||||
package config
|
||||
|
||||
// proxy configuration
|
||||
type ProxyConfig struct {
|
||||
Type string `json:"type"`
|
||||
Addr string `json:"addr"`
|
||||
}
|
||||
|
||||
// default tor proxy
|
||||
var DefaultTorProxy = ProxyConfig{
|
||||
Type: "socks",
|
||||
Addr: "127.0.0.1:9050",
|
||||
}
|
||||
11
contrib/backends/nntpchand/src/nntpchan/lib/config/ssl.go
Normal file
11
contrib/backends/nntpchand/src/nntpchan/lib/config/ssl.go
Normal file
@@ -0,0 +1,11 @@
|
||||
package config
|
||||
|
||||
// settings for setting up ssl
|
||||
type SSLSettings struct {
|
||||
// path to ssl private key
|
||||
SSLKeyFile string `json:"key"`
|
||||
// path to ssl certificate signed by CA
|
||||
SSLCertFile string `json:"cert"`
|
||||
// domain name to use for ssl
|
||||
DomainName string `json:"fqdn"`
|
||||
}
|
||||
10
contrib/backends/nntpchand/src/nntpchan/lib/config/store.go
Normal file
10
contrib/backends/nntpchand/src/nntpchan/lib/config/store.go
Normal file
@@ -0,0 +1,10 @@
|
||||
package config
|
||||
|
||||
type StoreConfig struct {
|
||||
// path to article directory
|
||||
Path string `json:"path"`
|
||||
}
|
||||
|
||||
var DefaultStoreConfig = StoreConfig{
|
||||
Path: "storage",
|
||||
}
|
||||
@@ -0,0 +1,17 @@
|
||||
package config
|
||||
|
||||
// configuration for a single web hook
|
||||
type WebhookConfig struct {
|
||||
// user provided name for this hook
|
||||
Name string `json:"name"`
|
||||
// callback URL for webhook
|
||||
URL string `json:"url"`
|
||||
// dialect to use when calling webhook
|
||||
Dialect string `json:"dialect"`
|
||||
}
|
||||
|
||||
var DefaultWebHookConfig = &WebhookConfig{
|
||||
Name: "vichan",
|
||||
Dialect: "vichan",
|
||||
URL: "http://localhost/webhook.php",
|
||||
}
|
||||
@@ -0,0 +1,5 @@
|
||||
//
|
||||
// nntpchan crypto package
|
||||
// wraps all external crypro libs
|
||||
//
|
||||
package crypto
|
||||
@@ -0,0 +1,8 @@
|
||||
package crypto
|
||||
|
||||
import (
|
||||
"github.com/dchest/blake256"
|
||||
)
|
||||
|
||||
// common hash function is blake2
|
||||
var Hash = blake256.New
|
||||
77
contrib/backends/nntpchand/src/nntpchan/lib/crypto/nacl.go
Normal file
77
contrib/backends/nntpchand/src/nntpchan/lib/crypto/nacl.go
Normal file
@@ -0,0 +1,77 @@
|
||||
package crypto
|
||||
|
||||
import (
|
||||
"crypto/sha512"
|
||||
"hash"
|
||||
"nntpchan/lib/crypto/nacl"
|
||||
)
|
||||
|
||||
type fuckyNacl struct {
|
||||
k []byte
|
||||
hash hash.Hash
|
||||
}
|
||||
|
||||
func (fucky *fuckyNacl) Write(d []byte) (int, error) {
|
||||
return fucky.hash.Write(d)
|
||||
}
|
||||
|
||||
func (fucky *fuckyNacl) Sign() (s Signature) {
|
||||
h := fucky.hash.Sum(nil)
|
||||
if h == nil {
|
||||
panic("fuck.hash.Sum == nil")
|
||||
}
|
||||
|
||||
_, sec := nacl.SeedToKeyPair(fucky.k)
|
||||
sig := nacl.CryptoSignFucky(h, sec)
|
||||
if sig == nil {
|
||||
panic("fucky signer's call to nacl.CryptoSignFucky returned nil")
|
||||
}
|
||||
s = Signature(sig)
|
||||
fucky.resetState()
|
||||
return
|
||||
}
|
||||
|
||||
// reset inner state so we can reuse this fuckyNacl for another operation
|
||||
func (fucky *fuckyNacl) resetState() {
|
||||
fucky.hash = sha512.New()
|
||||
}
|
||||
|
||||
func (fucky *fuckyNacl) Verify(sig Signature) (valid bool) {
|
||||
h := fucky.hash.Sum(nil)
|
||||
if h == nil {
|
||||
panic("fucky.hash.Sum == nil")
|
||||
}
|
||||
valid = nacl.CryptoVerifyFucky(h, sig, fucky.k)
|
||||
fucky.resetState()
|
||||
return
|
||||
}
|
||||
|
||||
func createFucky(k []byte) *fuckyNacl {
|
||||
return &fuckyNacl{
|
||||
k: k,
|
||||
hash: sha512.New(),
|
||||
}
|
||||
}
|
||||
|
||||
// create a standard signer given a secret key
|
||||
func CreateSigner(sk []byte) Signer {
|
||||
return createFucky(sk)
|
||||
}
|
||||
|
||||
// create a standard verifier given a public key
|
||||
func CreateVerifier(pk []byte) Verifer {
|
||||
return createFucky(pk)
|
||||
}
|
||||
|
||||
// get the public component given the secret key
|
||||
func ToPublic(sk []byte) (pk []byte) {
|
||||
pk, _ = nacl.SeedToKeyPair(sk)
|
||||
return
|
||||
}
|
||||
|
||||
// create a standard keypair
|
||||
func GenKeypair() (pk, sk []byte) {
|
||||
sk = RandBytes(32)
|
||||
pk, _ = nacl.SeedToKeyPair(sk)
|
||||
return
|
||||
}
|
||||
@@ -0,0 +1,44 @@
|
||||
package nacl
|
||||
|
||||
import (
|
||||
"crypto/sha512"
|
||||
"edwards25519"
|
||||
"golang.org/x/crypto/ed25519"
|
||||
)
|
||||
|
||||
func CryptoVerifyFucky(h, sig, pk []byte) bool {
|
||||
pub := make(ed25519.PublicKey, ed25519.PublicKeySize)
|
||||
copy(pub, pk)
|
||||
return ed25519.Verify(pub, h, sig)
|
||||
}
|
||||
|
||||
func CryptoSignFucky(hash, sk []byte) []byte {
|
||||
sec := make(ed25519.PrivateKey, ed25519.PrivateKeySize)
|
||||
copy(sec, sk)
|
||||
return ed25519.Sign(sec, hash)
|
||||
}
|
||||
|
||||
func SeedToKeyPair(seed []byte) (pk, sk []byte) {
|
||||
|
||||
h := sha512.Sum512(seed[0:32])
|
||||
sk = h[:]
|
||||
sk[0] &= 248
|
||||
sk[31] &= 63
|
||||
sk[31] |= 64
|
||||
// scalarmult magick shit
|
||||
pk = scalarBaseMult(sk[0:32])
|
||||
copy(sk[0:32], seed[0:32])
|
||||
copy(sk[32:64], pk[0:32])
|
||||
return
|
||||
}
|
||||
|
||||
func scalarBaseMult(sk []byte) (pk []byte) {
|
||||
var skey [32]byte
|
||||
var pkey [32]byte
|
||||
copy(skey[:], sk[0:32])
|
||||
var h edwards25519.ExtendedGroupElement
|
||||
edwards25519.GeScalarMultBase(&h, &skey)
|
||||
h.ToBytes(&pkey)
|
||||
pk = pkey[:]
|
||||
return
|
||||
}
|
||||
@@ -0,0 +1,34 @@
|
||||
package crypto
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"crypto/rand"
|
||||
"io"
|
||||
"testing"
|
||||
)
|
||||
|
||||
func TestNaclToPublic(t *testing.T) {
|
||||
pk, sk := GenKeypair()
|
||||
t_pk := ToPublic(sk)
|
||||
if !bytes.Equal(pk, t_pk) {
|
||||
t.Logf("%q != %q", pk, t_pk)
|
||||
t.Fail()
|
||||
}
|
||||
}
|
||||
|
||||
func TestNaclSignVerify(t *testing.T) {
|
||||
var msg [1024]byte
|
||||
pk, sk := GenKeypair()
|
||||
io.ReadFull(rand.Reader, msg[:])
|
||||
|
||||
signer := CreateSigner(sk)
|
||||
signer.Write(msg[:])
|
||||
sig := signer.Sign()
|
||||
|
||||
verifier := CreateVerifier(pk)
|
||||
verifier.Write(msg[:])
|
||||
if !verifier.Verify(sig) {
|
||||
t.Logf("%q is invalid signature and is %dB long", sig, len(sig))
|
||||
t.Fail()
|
||||
}
|
||||
}
|
||||
13
contrib/backends/nntpchand/src/nntpchan/lib/crypto/rand.go
Normal file
13
contrib/backends/nntpchand/src/nntpchan/lib/crypto/rand.go
Normal file
@@ -0,0 +1,13 @@
|
||||
package crypto
|
||||
|
||||
import (
|
||||
"crypto/rand"
|
||||
"io"
|
||||
)
|
||||
|
||||
// generate random bytes
|
||||
func RandBytes(n int) []byte {
|
||||
b := make([]byte, n)
|
||||
io.ReadFull(rand.Reader, b)
|
||||
return b
|
||||
}
|
||||
25
contrib/backends/nntpchand/src/nntpchan/lib/crypto/sig.go
Normal file
25
contrib/backends/nntpchand/src/nntpchan/lib/crypto/sig.go
Normal file
@@ -0,0 +1,25 @@
|
||||
package crypto
|
||||
|
||||
import "io"
|
||||
|
||||
// a detached signature
|
||||
type Signature []byte
|
||||
|
||||
type SigEncoder interface {
|
||||
// encode a signature to an io.Writer
|
||||
// return error if one occurrened while writing out signature
|
||||
Encode(sig Signature, w io.Writer) error
|
||||
// encode a signature to a string
|
||||
EncodeString(sig Signature) string
|
||||
}
|
||||
|
||||
// a decoder of signatures
|
||||
type SigDecoder interface {
|
||||
// decode signature from io.Reader
|
||||
// reads all data until io.EOF
|
||||
// returns singaure or error if an error occured while reading
|
||||
Decode(r io.Reader) (Signature, error)
|
||||
// decode a signature from string
|
||||
// returns signature or error if an error ocurred while decoding
|
||||
DecodeString(str string) (Signature, error)
|
||||
}
|
||||
14
contrib/backends/nntpchand/src/nntpchan/lib/crypto/sign.go
Normal file
14
contrib/backends/nntpchand/src/nntpchan/lib/crypto/sign.go
Normal file
@@ -0,0 +1,14 @@
|
||||
package crypto
|
||||
|
||||
import "io"
|
||||
|
||||
//
|
||||
// provides generic signing interface for producing detached signatures
|
||||
// call Write() to feed data to be signed, call Sign() to generate
|
||||
// a detached signature
|
||||
//
|
||||
type Signer interface {
|
||||
io.Writer
|
||||
// generate detached Signature from previously fed body via Write()
|
||||
Sign() Signature
|
||||
}
|
||||
14
contrib/backends/nntpchand/src/nntpchan/lib/crypto/verify.go
Normal file
14
contrib/backends/nntpchand/src/nntpchan/lib/crypto/verify.go
Normal file
@@ -0,0 +1,14 @@
|
||||
package crypto
|
||||
|
||||
import "io"
|
||||
|
||||
// provides generic signature
|
||||
// call Write() to feed in message body
|
||||
// once the entire body has been fed in via Write() call Verify() with detached
|
||||
// signature to verify the detached signature against the previously fed body
|
||||
type Verifer interface {
|
||||
io.Writer
|
||||
// verify detached signature from body previously fed via Write()
|
||||
// return true if the detached signature is valid given the body
|
||||
Verify(sig Signature) bool
|
||||
}
|
||||
@@ -0,0 +1,29 @@
|
||||
package database
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"nntpchan/lib/config"
|
||||
"nntpchan/lib/model"
|
||||
"strings"
|
||||
)
|
||||
|
||||
//
|
||||
type Database interface {
|
||||
ThreadByMessageID(msgid string) (*model.Thread, error)
|
||||
ThreadByHash(hash string) (*model.Thread, error)
|
||||
MessageIDByHash(hash string) (string, error)
|
||||
BoardPage(newsgroup string, pageno, perpage int) (*model.BoardPage, error)
|
||||
StorePost(post model.Post) error
|
||||
Init() error
|
||||
}
|
||||
|
||||
// get new database connector from configuration
|
||||
func NewDBFromConfig(c *config.DatabaseConfig) (db Database, err error) {
|
||||
dbtype := strings.ToLower(c.Type)
|
||||
if dbtype == "postgres" {
|
||||
db, err = createPostgresDatabase(c.Addr, c.Username, c.Password)
|
||||
} else {
|
||||
err = errors.New("no such database driver: " + c.Type)
|
||||
}
|
||||
return
|
||||
}
|
||||
@@ -0,0 +1,4 @@
|
||||
//
|
||||
// database driver
|
||||
//
|
||||
package database
|
||||
@@ -0,0 +1,58 @@
|
||||
package database
|
||||
|
||||
import (
|
||||
"database/sql"
|
||||
_ "github.com/lib/pq"
|
||||
"nntpchan/lib/model"
|
||||
)
|
||||
|
||||
type PostgresDB struct {
|
||||
conn *sql.DB
|
||||
}
|
||||
|
||||
func (db *PostgresDB) ThreadByMessageID(msgid string) (thread *model.Thread, err error) {
|
||||
|
||||
return
|
||||
}
|
||||
|
||||
func (db *PostgresDB) ThreadByHash(hash string) (thread *model.Thread, err error) {
|
||||
return
|
||||
}
|
||||
|
||||
func (db *PostgresDB) MessageIDByHash(hash string) (msgid string, err error) {
|
||||
|
||||
return
|
||||
}
|
||||
|
||||
func (db *PostgresDB) BoardPage(newsgroup string, pageno, perpage int) (page *model.BoardPage, err error) {
|
||||
|
||||
return
|
||||
}
|
||||
|
||||
func (db *PostgresDB) StorePost(post model.Post) (err error) {
|
||||
return
|
||||
}
|
||||
|
||||
func (db *PostgresDB) Init() (err error) {
|
||||
|
||||
return
|
||||
}
|
||||
|
||||
func createPostgresDatabase(addr, user, passwd string) (p *PostgresDB, err error) {
|
||||
p = new(PostgresDB)
|
||||
var authstring string
|
||||
if len(addr) > 0 {
|
||||
authstring += " host=" + addr
|
||||
}
|
||||
if len(user) > 0 {
|
||||
authstring += " username=" + user
|
||||
}
|
||||
if len(passwd) > 0 {
|
||||
authstring += " password=" + passwd
|
||||
}
|
||||
p.conn, err = sql.Open("postgres", authstring)
|
||||
if err != nil {
|
||||
p = nil
|
||||
}
|
||||
return
|
||||
}
|
||||
123
contrib/backends/nntpchand/src/nntpchan/lib/frontend/captcha.go
Normal file
123
contrib/backends/nntpchand/src/nntpchan/lib/frontend/captcha.go
Normal file
@@ -0,0 +1,123 @@
|
||||
package frontend
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"errors"
|
||||
"fmt"
|
||||
"github.com/dchest/captcha"
|
||||
"github.com/gorilla/mux"
|
||||
"github.com/gorilla/sessions"
|
||||
"net/http"
|
||||
"nntpchan/lib/config"
|
||||
)
|
||||
|
||||
// server of captchas
|
||||
// implements frontend.Middleware
|
||||
type CaptchaServer struct {
|
||||
h int
|
||||
w int
|
||||
store *sessions.CookieStore
|
||||
prefix string
|
||||
sessionName string
|
||||
}
|
||||
|
||||
// create new captcha server using existing session store
|
||||
func NewCaptchaServer(w, h int, prefix string, store *sessions.CookieStore) *CaptchaServer {
|
||||
return &CaptchaServer{
|
||||
h: h,
|
||||
w: w,
|
||||
prefix: prefix,
|
||||
store: store,
|
||||
sessionName: "captcha",
|
||||
}
|
||||
}
|
||||
|
||||
func (cs *CaptchaServer) Reload(c *config.MiddlewareConfig) {
|
||||
|
||||
}
|
||||
|
||||
func (cs *CaptchaServer) SetupRoutes(m *mux.Router) {
|
||||
m.Path("/new").HandlerFunc(cs.NewCaptcha)
|
||||
m.Path("/img/{f}").Handler(captcha.Server(cs.w, cs.h))
|
||||
m.Path("/verify.json").HandlerFunc(cs.VerifyCaptcha)
|
||||
}
|
||||
|
||||
// return true if this session has solved the last captcha given provided solution, otherwise false
|
||||
func (cs *CaptchaServer) CheckSession(w http.ResponseWriter, r *http.Request, solution string) (bool, error) {
|
||||
s, err := cs.store.Get(r, cs.sessionName)
|
||||
if err == nil {
|
||||
id, ok := s.Values["captcha_id"]
|
||||
if ok {
|
||||
return captcha.VerifyString(id.(string), solution), nil
|
||||
}
|
||||
}
|
||||
return false, err
|
||||
}
|
||||
|
||||
// verify a captcha
|
||||
func (cs *CaptchaServer) VerifyCaptcha(w http.ResponseWriter, r *http.Request) {
|
||||
dec := json.NewDecoder(r.Body)
|
||||
defer r.Body.Close()
|
||||
// request
|
||||
req := make(map[string]string)
|
||||
// response
|
||||
resp := make(map[string]interface{})
|
||||
resp["solved"] = false
|
||||
// decode request
|
||||
err := dec.Decode(req)
|
||||
if err == nil {
|
||||
// decode okay
|
||||
id, ok := req["id"]
|
||||
if ok {
|
||||
// we have id
|
||||
solution, ok := req["solution"]
|
||||
if ok {
|
||||
// we have solution and id
|
||||
resp["solved"] = captcha.VerifyString(id, solution)
|
||||
} else {
|
||||
// we don't have solution
|
||||
err = errors.New("no captcha solution provided")
|
||||
}
|
||||
} else {
|
||||
// we don't have id
|
||||
err = errors.New("no captcha id provided")
|
||||
}
|
||||
}
|
||||
if err != nil {
|
||||
// error happened
|
||||
resp["error"] = err.Error()
|
||||
}
|
||||
// send reply
|
||||
w.Header().Set("Content-Type", "text/json; encoding=UTF-8")
|
||||
enc := json.NewEncoder(w)
|
||||
enc.Encode(resp)
|
||||
}
|
||||
|
||||
// generate a new captcha
|
||||
func (cs *CaptchaServer) NewCaptcha(w http.ResponseWriter, r *http.Request) {
|
||||
// obtain session
|
||||
sess, err := cs.store.Get(r, cs.sessionName)
|
||||
if err != nil {
|
||||
// failed to obtain session
|
||||
http.Error(w, err.Error(), http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
// new captcha
|
||||
id := captcha.New()
|
||||
// do we want to interpret as json?
|
||||
use_json := r.URL.Query().Get("t") == "json"
|
||||
// image url
|
||||
url := fmt.Sprintf("%simg/%s.png", cs.prefix, id)
|
||||
if use_json {
|
||||
// send json
|
||||
enc := json.NewEncoder(w)
|
||||
enc.Encode(map[string]string{"id": id, "url": url})
|
||||
} else {
|
||||
// set captcha id
|
||||
sess.Values["captcha_id"] = id
|
||||
// save session
|
||||
sess.Save(r, w)
|
||||
// rediect to image
|
||||
http.Redirect(w, r, url, http.StatusFound)
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,5 @@
|
||||
//
|
||||
// nntpchan frontend
|
||||
// allows posting to nntpchan network via various implementations
|
||||
//
|
||||
package frontend
|
||||
@@ -0,0 +1,50 @@
|
||||
package frontend
|
||||
|
||||
import (
|
||||
"nntpchan/lib/config"
|
||||
"nntpchan/lib/database"
|
||||
"nntpchan/lib/model"
|
||||
"nntpchan/lib/nntp"
|
||||
"nntpchan/lib/store"
|
||||
)
|
||||
|
||||
// a frontend that displays nntp posts and allows posting
|
||||
type Frontend interface {
|
||||
|
||||
// run mainloop
|
||||
Serve()
|
||||
|
||||
// do we accept this inbound post?
|
||||
AllowPost(p model.PostReference) bool
|
||||
|
||||
// trigger a manual regen of indexes for a root post
|
||||
Regen(p model.PostReference)
|
||||
|
||||
// implements nntp.EventHooks
|
||||
GotArticle(msgid nntp.MessageID, group nntp.Newsgroup)
|
||||
|
||||
// implements nntp.EventHooks
|
||||
SentArticleVia(msgid nntp.MessageID, feedname string)
|
||||
|
||||
// reload config
|
||||
Reload(c *config.FrontendConfig)
|
||||
|
||||
// get frontend name
|
||||
Name() string
|
||||
}
|
||||
|
||||
// create a new http frontend give frontend config
|
||||
func NewHTTPFrontend(c *config.FrontendConfig, db database.Database, s store.Storage) (f Frontend, err error) {
|
||||
|
||||
var mid Middleware
|
||||
if c.Middleware != nil {
|
||||
// middleware configured
|
||||
mid, err = OverchanMiddleware(c.Middleware, db)
|
||||
}
|
||||
|
||||
if err == nil {
|
||||
// create http frontend only if no previous errors
|
||||
f, err = createHttpFrontend(c, mid, db, s)
|
||||
}
|
||||
return
|
||||
}
|
||||
147
contrib/backends/nntpchand/src/nntpchan/lib/frontend/http.go
Normal file
147
contrib/backends/nntpchand/src/nntpchan/lib/frontend/http.go
Normal file
@@ -0,0 +1,147 @@
|
||||
package frontend
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
log "github.com/Sirupsen/logrus"
|
||||
"github.com/gorilla/mux"
|
||||
"net/http"
|
||||
"nntpchan/lib/admin"
|
||||
"nntpchan/lib/api"
|
||||
"nntpchan/lib/config"
|
||||
"nntpchan/lib/database"
|
||||
"nntpchan/lib/model"
|
||||
"nntpchan/lib/nntp"
|
||||
"nntpchan/lib/store"
|
||||
"time"
|
||||
)
|
||||
|
||||
// http frontend server
|
||||
// provides glue layer between nntp and middleware
|
||||
type httpFrontend struct {
|
||||
// bind address
|
||||
addr string
|
||||
// http mux
|
||||
httpmux *mux.Router
|
||||
// admin panel
|
||||
adminPanel *admin.Server
|
||||
// static files path
|
||||
staticDir string
|
||||
// http middleware
|
||||
middleware Middleware
|
||||
// api server
|
||||
apiserve *api.Server
|
||||
// database driver
|
||||
db database.Database
|
||||
// article storage
|
||||
storage store.Storage
|
||||
}
|
||||
|
||||
func (f *httpFrontend) Name() string {
|
||||
return fmt.Sprintf("frontend-%s", f.addr)
|
||||
}
|
||||
|
||||
// reload http frontend
|
||||
// reloads middleware
|
||||
func (f *httpFrontend) Reload(c *config.FrontendConfig) {
|
||||
if f.middleware == nil {
|
||||
if c.Middleware != nil {
|
||||
var err error
|
||||
// no middleware set, create middleware
|
||||
f.middleware, err = OverchanMiddleware(c.Middleware, f.db)
|
||||
if err != nil {
|
||||
log.Errorf("overchan middleware reload failed: %s", err.Error())
|
||||
}
|
||||
|
||||
}
|
||||
} else {
|
||||
// middleware exists
|
||||
// do middleware reload
|
||||
f.middleware.Reload(c.Middleware)
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
// serve http requests from net.Listener
|
||||
func (f *httpFrontend) Serve() {
|
||||
// serve http
|
||||
for {
|
||||
err := http.ListenAndServe(f.addr, f.httpmux)
|
||||
if err != nil {
|
||||
log.Errorf("failed to listen and serve with frontend: %s", err)
|
||||
}
|
||||
time.Sleep(time.Second)
|
||||
}
|
||||
}
|
||||
|
||||
// serve robots.txt page
|
||||
func (f *httpFrontend) serveRobots(w http.ResponseWriter, r *http.Request) {
|
||||
fmt.Fprintf(w, "User-Agent: *\nDisallow: /\n")
|
||||
}
|
||||
|
||||
func (f *httpFrontend) AllowPost(p model.PostReference) bool {
|
||||
// TODO: implement
|
||||
return true
|
||||
}
|
||||
|
||||
func (f *httpFrontend) Regen(p model.PostReference) {
|
||||
// TODO: implement
|
||||
}
|
||||
|
||||
func (f *httpFrontend) GotArticle(msgid nntp.MessageID, group nntp.Newsgroup) {
|
||||
// TODO: implement
|
||||
}
|
||||
|
||||
func (f *httpFrontend) SentArticleVia(msgid nntp.MessageID, feedname string) {
|
||||
// TODO: implement
|
||||
}
|
||||
|
||||
func createHttpFrontend(c *config.FrontendConfig, mid Middleware, db database.Database, s store.Storage) (f *httpFrontend, err error) {
|
||||
f = new(httpFrontend)
|
||||
// set db
|
||||
// db.Ensure() called elsewhere
|
||||
f.db = db
|
||||
|
||||
// set up storage
|
||||
// s.Ensure() called elsewhere
|
||||
f.storage = s
|
||||
|
||||
// set bind address
|
||||
f.addr = c.BindAddr
|
||||
|
||||
// set up mux
|
||||
f.httpmux = mux.NewRouter()
|
||||
|
||||
// set up admin panel
|
||||
f.adminPanel = admin.NewServer()
|
||||
|
||||
// set static files dir
|
||||
f.staticDir = c.Static
|
||||
|
||||
// set middleware
|
||||
f.middleware = mid
|
||||
|
||||
// set up routes
|
||||
|
||||
if f.adminPanel != nil {
|
||||
// route up admin panel
|
||||
f.httpmux.PathPrefix("/admin/").Handler(f.adminPanel)
|
||||
}
|
||||
|
||||
if f.middleware != nil {
|
||||
// route up middleware
|
||||
f.middleware.SetupRoutes(f.httpmux)
|
||||
}
|
||||
|
||||
if f.apiserve != nil {
|
||||
// route up api
|
||||
f.apiserve.SetupRoutes(f.httpmux.PathPrefix("/api/").Subrouter())
|
||||
}
|
||||
|
||||
// route up robots.txt
|
||||
f.httpmux.Path("/robots.txt").HandlerFunc(f.serveRobots)
|
||||
|
||||
// route up static files
|
||||
f.httpmux.PathPrefix("/static/").Handler(http.FileServer(http.Dir(f.staticDir)))
|
||||
|
||||
return
|
||||
}
|
||||
@@ -0,0 +1,14 @@
|
||||
package frontend
|
||||
|
||||
import (
|
||||
"github.com/gorilla/mux"
|
||||
"nntpchan/lib/config"
|
||||
)
|
||||
|
||||
// http middleware
|
||||
type Middleware interface {
|
||||
// set up routes
|
||||
SetupRoutes(m *mux.Router)
|
||||
// reload with new configuration
|
||||
Reload(c *config.MiddlewareConfig)
|
||||
}
|
||||
115
contrib/backends/nntpchand/src/nntpchan/lib/frontend/overchan.go
Normal file
115
contrib/backends/nntpchand/src/nntpchan/lib/frontend/overchan.go
Normal file
@@ -0,0 +1,115 @@
|
||||
package frontend
|
||||
|
||||
import (
|
||||
log "github.com/Sirupsen/logrus"
|
||||
"github.com/gorilla/mux"
|
||||
"github.com/gorilla/sessions"
|
||||
"html/template"
|
||||
"net/http"
|
||||
"nntpchan/lib/config"
|
||||
"nntpchan/lib/database"
|
||||
"path/filepath"
|
||||
"strconv"
|
||||
)
|
||||
|
||||
// standard overchan imageboard middleware
|
||||
type overchanMiddleware struct {
|
||||
templ *template.Template
|
||||
captcha *CaptchaServer
|
||||
store *sessions.CookieStore
|
||||
db database.Database
|
||||
}
|
||||
|
||||
func (m *overchanMiddleware) SetupRoutes(mux *mux.Router) {
|
||||
// setup front page handler
|
||||
mux.Path("/").HandlerFunc(m.ServeIndex)
|
||||
// setup thread handler
|
||||
mux.Path("/t/{id}/").HandlerFunc(m.ServeThread)
|
||||
// setup board page handler
|
||||
mux.Path("/b/{name}/").HandlerFunc(m.ServeBoardPage)
|
||||
// setup posting endpoint
|
||||
mux.Path("/post")
|
||||
// create captcha
|
||||
captchaPrefix := "/captcha/"
|
||||
m.captcha = NewCaptchaServer(200, 400, captchaPrefix, m.store)
|
||||
// setup captcha endpoint
|
||||
m.captcha.SetupRoutes(mux.PathPrefix(captchaPrefix).Subrouter())
|
||||
}
|
||||
|
||||
// reload middleware
|
||||
func (m *overchanMiddleware) Reload(c *config.MiddlewareConfig) {
|
||||
// reload templates
|
||||
templ, err := template.ParseGlob(filepath.Join(c.Templates, "*.tmpl"))
|
||||
if err == nil {
|
||||
log.Infof("middleware reloaded templates")
|
||||
m.templ = templ
|
||||
} else {
|
||||
log.Errorf("middleware reload failed: %s", err.Error())
|
||||
}
|
||||
}
|
||||
|
||||
func (m *overchanMiddleware) ServeBoardPage(w http.ResponseWriter, r *http.Request) {
|
||||
param := mux.Vars(r)
|
||||
board := param["name"]
|
||||
page := r.URL.Query().Get("q")
|
||||
pageno, err := strconv.Atoi(page)
|
||||
if err == nil {
|
||||
var obj interface{}
|
||||
obj, err = m.db.BoardPage(board, pageno, 10)
|
||||
if err == nil {
|
||||
m.serveTemplate(w, r, "board.html.tmpl", obj)
|
||||
} else {
|
||||
m.serveTemplate(w, r, "error.html.tmpl", err)
|
||||
}
|
||||
} else {
|
||||
// 404
|
||||
http.NotFound(w, r)
|
||||
}
|
||||
}
|
||||
|
||||
// serve cached thread
|
||||
func (m *overchanMiddleware) ServeThread(w http.ResponseWriter, r *http.Request) {
|
||||
param := mux.Vars(r)
|
||||
obj, err := m.db.ThreadByHash(param["id"])
|
||||
if err == nil {
|
||||
m.serveTemplate(w, r, "thread.html.tmpl", obj)
|
||||
} else {
|
||||
m.serveTemplate(w, r, "error.html.tmpl", err)
|
||||
}
|
||||
}
|
||||
|
||||
// serve index page
|
||||
func (m *overchanMiddleware) ServeIndex(w http.ResponseWriter, r *http.Request) {
|
||||
m.serveTemplate(w, r, "index.html.tmpl", nil)
|
||||
}
|
||||
|
||||
// serve a template
|
||||
func (m *overchanMiddleware) serveTemplate(w http.ResponseWriter, r *http.Request, tname string, obj interface{}) {
|
||||
t := m.templ.Lookup(tname)
|
||||
if t == nil {
|
||||
log.WithFields(log.Fields{
|
||||
"template": tname,
|
||||
}).Warning("template not found")
|
||||
http.NotFound(w, r)
|
||||
} else {
|
||||
err := t.Execute(w, obj)
|
||||
if err != nil {
|
||||
// error getting model
|
||||
log.WithFields(log.Fields{
|
||||
"error": err,
|
||||
"template": tname,
|
||||
}).Warning("failed to render template")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// create standard overchan middleware
|
||||
func OverchanMiddleware(c *config.MiddlewareConfig, db database.Database) (m Middleware, err error) {
|
||||
om := new(overchanMiddleware)
|
||||
om.templ, err = template.ParseGlob(filepath.Join(c.Templates, "*.tmpl"))
|
||||
om.db = db
|
||||
if err == nil {
|
||||
m = om
|
||||
}
|
||||
return
|
||||
}
|
||||
@@ -0,0 +1 @@
|
||||
package frontend
|
||||
@@ -0,0 +1 @@
|
||||
package frontend
|
||||
15
contrib/backends/nntpchand/src/nntpchan/lib/model/article.go
Normal file
15
contrib/backends/nntpchand/src/nntpchan/lib/model/article.go
Normal file
@@ -0,0 +1,15 @@
|
||||
package model
|
||||
|
||||
type Article struct {
|
||||
Subject string
|
||||
Name string
|
||||
Header map[string][]string
|
||||
Text string
|
||||
Attachments []Attachment
|
||||
MessageID string
|
||||
Newsgroup string
|
||||
Reference string
|
||||
Path string
|
||||
Posted int64
|
||||
Addr string
|
||||
}
|
||||
@@ -0,0 +1,10 @@
|
||||
package model
|
||||
|
||||
type Attachment struct {
|
||||
Path string
|
||||
Name string
|
||||
Mime string
|
||||
Hash string
|
||||
// only filled for api
|
||||
Body string
|
||||
}
|
||||
@@ -0,0 +1,4 @@
|
||||
package model
|
||||
|
||||
type Board struct {
|
||||
}
|
||||
@@ -0,0 +1,8 @@
|
||||
package model
|
||||
|
||||
type BoardPage struct {
|
||||
Name string
|
||||
Page int
|
||||
Pages int
|
||||
Threads []Thread
|
||||
}
|
||||
2
contrib/backends/nntpchand/src/nntpchan/lib/model/doc.go
Normal file
2
contrib/backends/nntpchand/src/nntpchan/lib/model/doc.go
Normal file
@@ -0,0 +1,2 @@
|
||||
// MVC models
|
||||
package model
|
||||
29
contrib/backends/nntpchand/src/nntpchan/lib/model/misc.go
Normal file
29
contrib/backends/nntpchand/src/nntpchan/lib/model/misc.go
Normal file
@@ -0,0 +1,29 @@
|
||||
package model
|
||||
|
||||
import (
|
||||
"time"
|
||||
)
|
||||
|
||||
type ArticleHeader map[string][]string
|
||||
|
||||
// a ( MessageID , newsgroup ) tuple
|
||||
type ArticleEntry [2]string
|
||||
|
||||
func (self ArticleEntry) Newsgroup() string {
|
||||
return self[1]
|
||||
}
|
||||
|
||||
func (self ArticleEntry) MessageID() string {
|
||||
return self[0]
|
||||
}
|
||||
|
||||
// a ( time point, post count ) tuple
|
||||
type PostEntry [2]int64
|
||||
|
||||
func (self PostEntry) Time() time.Time {
|
||||
return time.Unix(self[0], 0)
|
||||
}
|
||||
|
||||
func (self PostEntry) Count() int64 {
|
||||
return self[1]
|
||||
}
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user