Commit graph

1330 commits

Author SHA1 Message Date
shortcutme
38c663ee95
Use WHERE 1 for queries without argument 2017-10-04 13:10:26 +02:00
shortcutme
ca473d6c3b
Allow plugins on ContentManager 2017-10-04 12:51:37 +02:00
shortcutme
36b74e1c6a
ContentManager logging improvements 2017-10-04 12:51:24 +02:00
shortcutme
8e3e96fe65
Create storage object after site settings loaded 2017-10-04 12:50:24 +02:00
shortcutme
0f0f3894ff
request from directory . should drop forbidden error 2017-10-04 12:48:48 +02:00
shortcutme
a2182e8a8d
Invalid nonce requests automatically shows wrapper now 2017-10-04 12:48:16 +02:00
shortcutme
4042de460e
actionFile allows file details to be passed as parameter 2017-10-04 12:46:06 +02:00
shortcutme
0dd34403a2
Combinate isfile and filesize query to one function 2017-10-04 12:44:34 +02:00
shortcutme
edb9d3f719
Media files requested from non-seeded site not wokring anymore 2017-10-04 12:42:05 +02:00
shortcutme
1f5db0aa24
Nonce checking moved to route command 2017-10-04 12:41:14 +02:00
shortcutme
74b2408668
Move path checking to parsePath 2017-10-04 12:39:08 +02:00
shortcutme
f53612bef7
Media request should start with normal characters 2017-10-04 12:38:44 +02:00
shortcutme
4d991cda6d
Also serve htm files with wrapper 2017-10-04 12:37:56 +02:00
shortcutme
6984575901
Remove dead reload code 2017-10-04 12:37:34 +02:00
shortcutme
75b44f6980
Raise SecurityError on invalid path 2017-10-04 12:37:22 +02:00
shortcutme
3c46f60042
Show wrapper automatically if wrapper nonce is invalid 2017-10-04 12:35:15 +02:00
shortcutme
7dbc323f76
ZeroNet-internal virtual path on UiServer for internal commands 2017-10-04 12:33:43 +02:00
shortcutme
903b62ba7c
Make fileNeed API command async 2017-10-04 12:32:40 +02:00
shortcutme
53da40fe5d
Allow to show site directory in local file browser 2017-10-04 12:31:57 +02:00
shortcutme
d0f85f3d04
String / from left during dirname conversion 2017-10-03 16:05:01 +02:00
shortcutme
49d863fa54
Reduce indent by using continue instead of if 2017-10-03 16:04:03 +02:00
shortcutme
6fe5e2b751
Speed up task competition by wait 10*0.1 sec for task finish instead of 1x1sec before start wokring on it 2017-10-03 16:02:49 +02:00
shortcutme
59d45f445a
Always start findOptional if no worker running but there is tasks 2017-10-03 16:01:02 +02:00
shortcutme
09d19da3bc
Always update hashfield for peer during findHash 2017-10-03 15:58:51 +02:00
shortcutme
1036d0e4a0
Allow second peer for same task only if priority is above 10 2017-10-03 15:58:01 +02:00
shortcutme
8ba4201237
More agressive optional file finding 2017-10-03 15:56:58 +02:00
shortcutme
7c69118c2c
Move peer adding to separate function 2017-10-03 15:55:42 +02:00
shortcutme
6238bb7f2d
Multiplexing support for peers (disabled by default) 2017-10-03 15:55:07 +02:00
shortcutme
42ea01dde9
No extra time for larger files task timeout 2017-10-03 15:53:59 +02:00
shortcutme
c0b8e802ec
Fix findhash initial delay 2017-10-03 15:53:00 +02:00
shortcutme
43bd8a2d6c
Stop findhash if all task finished during the findhash call 2017-10-03 15:52:37 +02:00
shortcutme
e85efe2c64
Restart find optional files algorithm if new task started since running the function 2017-10-03 15:52:04 +02:00
shortcutme
988d169687
Fix asked_peers ignore for optional files 2017-10-03 15:51:17 +02:00
shortcutme
43e6f374fa
Don't increase priority when addTask called again 2017-10-03 15:49:52 +02:00
shortcutme
c91011e6ea
Pass file info for addTask call 2017-10-03 15:49:08 +02:00
shortcutme
f45c0b2377
Log time taken for optonal file download 2017-10-03 15:48:36 +02:00
shortcutme
9b8eeb6a73
WorkerManager addTask returns task instead of event 2017-10-03 15:47:46 +02:00
shortcutme
468fe8f266
Move json formatting to separate function 2017-10-03 15:30:10 +02:00
shortcutme
5ccdfbd40a
Update site optional size on save 2017-10-03 15:29:52 +02:00
shortcutme
ad969dcca7
Move file download allowed checking to separate function 2017-10-03 15:29:26 +02:00
shortcutme
08b31416f3
Move needFileInfo to separate function 2017-10-03 15:28:37 +02:00
shortcutme
c494b01435
Update hashfiled more often 2017-10-03 15:26:53 +02:00
shortcutme
c0e69e91a1
Always use streamFile for files bigger than 512k, increase file reads to 1MB for larger files 2017-10-03 15:26:39 +02:00
shortcutme
1c029981ae
Raise exception when no response received 2017-10-03 15:23:25 +02:00
shortcutme
f9e64bc874
Log inner_path and location for peer request in verbose mode 2017-10-03 15:23:03 +02:00
shortcutme
8d26a572dd
Hashlib-like truncated sha512/256 object 2017-10-03 15:22:05 +02:00
shortcutme
936371a7ec
Support digest output for sha512sum 2017-10-03 15:20:50 +02:00
shortcutme
628cc992e9
Don't send ok result when update is queued 2017-10-03 15:19:34 +02:00
shortcutme
636813c603
Reduce connection cpu usage by socket send time 2017-10-03 15:19:09 +02:00
shortcutme
2eb6cc8f55
Don't add myself to findhash result if ip detection failed 2017-10-03 15:07:26 +02:00
shortcutme
8ae9b5261e
Unify handling Stream and Get file requests 2017-10-03 15:03:56 +02:00
shortcutme
7153982981
Allow to register callback after the pluginned classes got generated 2017-10-03 14:57:44 +02:00
shortcutme
fcfd428b54
Enable plugins for Peer class 2017-10-03 14:56:42 +02:00
shortcutme
20e3dc5fa7
Only enable source code reloading for normal action 2017-10-03 14:55:28 +02:00
shortcutme
32ca6ac1a7
Move site cache generation to separate function to allow plugins to extend it 2017-10-03 14:40:13 +02:00
shortcutme
02ad7542b3
Temporary disable P2P port checking until more client start supporting it 2017-10-03 14:39:04 +02:00
shortcutme
57c042ef79
Use recent peers for P2P port checking 2017-10-03 14:38:33 +02:00
shortcutme
52a468d9fd
Allow 10 second for reponse 2017-10-03 14:34:21 +02:00
shortcutme
2cf86642a2
Run connection cleanup every 15 seconds 2017-10-03 14:32:31 +02:00
shortcutme
e76164c7a9
Change the posistion of handleStream function 2017-10-03 14:32:02 +02:00
shortcutme
bf0d359116
Increase buffer size to 64k to better performance for big files 2017-10-03 14:31:39 +02:00
shortcutme
5f37bf3eef
Enable TCP_NODELAY if supported 2017-10-03 14:31:16 +02:00
shortcutme
d8453384ab
Separate socket creation and connection to be able to cancel it 2017-10-03 14:30:19 +02:00
shortcutme
f4cdc31788
Lock socket during sending data 2017-10-03 14:27:29 +02:00
Ivanq
f8f26f0a89 Return log_dir, data_dir, src_dir as result of getConfig 2017-09-25 19:10:17 +03:00
Ivanq
522e9ebf39 Show config via getConfig console command 2017-09-25 19:09:59 +03:00
ZeroNet
27a9ea78b8 Merge pull request #1122 from imachug/siteclone
Allow siteClone for non-admin sites
2017-09-22 11:01:43 +02:00
Ivanq
7fa019321c Check site before cloning 2017-09-22 08:28:39 +03:00
Ivanq
f98f52a50e Allow siteClone not for admin sites 2017-09-22 08:24:18 +03:00
ZeroNet
bc71555a73 Merge pull request #1070 from anoadragon453/small_gram_fix
Small English grammer fixes
2017-09-21 13:46:11 +02:00
shortcutme
d3d7489232
Rev2192, Fix incorrect site detection when using async commands with Cors or MergerSite plugin 2017-09-20 17:06:09 +02:00
Ivanq
db339eecd3 Allow 'backup' or 'log' as directories 2017-09-16 21:57:20 +03:00
ZeroNet
53cd2cdbf3 Merge pull request #1114 from imachug/binary
Read files as binary in fileGet()
2017-09-10 09:28:45 +02:00
Ivanq
4bbea46b90 Read files as binary in fileGet() 2017-09-10 09:46:21 +03:00
shortcutme
932db9bbe4
Rev2190 2017-09-02 14:28:40 +02:00
shortcutme
bfd3d18a10
Fix multiuser plugin compatibility 2017-09-02 14:28:01 +02:00
shortcutme
b584c586ec
Fix longer signers_sign signing 2017-09-02 14:26:39 +02:00
grez911
158f9e37e5 Added explanation of convertion actionWrapper response to list 2017-08-25 11:05:48 +03:00
grez911
905976a1b6 Added exception handling for broken user.json 2017-08-22 17:43:55 +03:00
shortcutme
5ad614743b
Rev2187 2017-08-19 18:55:48 +02:00
ZeroNet
d44f08382a Merge pull request #1076 from grez911/master
Added P2P portcheck
2017-08-18 14:47:38 +02:00
shortcutme
5e926ec98e
Rev2186 2017-08-18 14:47:08 +02:00
shortcutme
9f762a0230
Bootstrapper use python date functions instead of sqlite 2017-08-18 14:43:28 +02:00
shortcutme
f1c320dd22
Log sign errors 2017-08-18 14:38:58 +02:00
shortcutme
4c7500e248
Fix getDirname description 2017-08-18 14:37:56 +02:00
grez911
8487056edb Small fix in P2P portcheck 2017-08-18 11:43:06 +03:00
grez911
bf69d24566 Deleted unnecessary import statement 2017-08-18 11:38:26 +03:00
grez911
1fc2a917d4 Fix P2P port check 2017-08-18 11:29:41 +03:00
Sergei Bondarenko
c0a96983a7 Update FileServer.py 2017-08-16 14:32:47 +03:00
Sergei Bondarenko
a4132c9cb1 Update FileServer.py 2017-08-16 09:40:54 +03:00
grez911
5c5e4b914c Added P2P portcheck 2017-08-15 20:17:42 +03:00
shortcutme
1db2327b3d
Rev2180, Allow ajax requests using ajax_key http get parameter 2017-08-15 02:40:38 +02:00
shortcutme
0a380dc0ab
Rev2180 2017-08-09 14:22:17 +02:00
shortcutme
29aa1b7b93
Log file diffing timings 2017-08-09 14:21:59 +02:00
shortcutme
5a08545e2d
Only recalculate site sizes on exit 2017-08-09 14:21:44 +02:00
shortcutme
65d68fb8ac
Compile Ui js 2017-08-09 14:21:09 +02:00
shortcutme
d093764731
New API command: fileNeed to request optional file 2017-08-09 14:20:49 +02:00
shortcutme
24982aee42
Log invalid wrapper messages 2017-08-09 14:20:20 +02:00
shortcutme
ef4a4acbc0
Only display read error in verbose mode 2017-08-09 14:19:56 +02:00
shortcutme
b503d59c49
Support gzip compressed database files 2017-08-09 14:19:39 +02:00
shortcutme
f451ce6c91
6MB LimitedGzip file helper to avoid gzip bombs 2017-08-09 14:19:09 +02:00
shortcutme
4f729aa98f
Only use pure-python msgpack for socket streaming 2017-08-09 14:17:58 +02:00
Andrew (anoa)
c1aff56cf2
Small grammer fixes 2017-08-04 15:13:31 -07:00
shortcutme
bfd57561b7
Rev2170 2017-07-31 14:39:27 +02:00
shortcutme
4cd393e4d8
Auto download optional files command line argument 2017-07-31 14:39:21 +02:00
shortcutme
ac230219ee
DB cleanup error is not fatal 2017-07-31 14:35:48 +02:00
shortcutme
c96dce3d0b
Fix site cleanup from content.db 2017-07-31 14:35:01 +02:00
shortcutme
9e13994c54
Formatting SslPatch 2017-07-31 14:34:18 +02:00
shortcutme
b8d68e2589
Fix undefined ssl error 2017-07-31 14:34:06 +02:00
ZeroNet
5f753d41d4 Merge pull request #1061 from cclauss/patch-3
import binascii
2017-07-31 13:49:13 +02:00
cclauss
231195ba0a import binascii
Solves the undefined name on line 30
2017-07-31 12:28:55 +02:00
cclauss
504b147cee import math
Resolves the undefined name on line 54
2017-07-31 12:06:11 +02:00
shortcutme
eb97ea4f34
Rev2169 2017-07-29 13:46:04 +02:00
shortcutme
467cd480cf
Rev2168, Only avoid reload site on every missing file 2017-07-29 12:49:38 +02:00
shortcutme
6610914fdb
Rev2167, Skip downloading if no connection server specified 2017-07-28 22:57:41 +02:00
shortcutme
fa96ab453f
Rev2166, Mobile friendly notifications 2017-07-28 15:36:49 +02:00
shortcutme
5bdc3b4fb5
Rev2165 2017-07-27 16:30:37 +02:00
shortcutme
eee073c103
Publish incoming updates to more peers 2017-07-27 16:30:21 +02:00
shortcutme
35efd6b107
ServerShowdirectory admin API command to show directory 2017-07-27 16:29:39 +02:00
shortcutme
f45ecb6cf4
Log problematic pattern 2017-07-27 16:29:12 +02:00
shortcutme
db8fe8d890
Version 0.5.7, Rev2163 2017-07-19 22:52:35 +02:00
shortcutme
bd9f88416c
Rev2162 2017-07-19 16:48:40 +02:00
shortcutme
504d7812e5
Fix exception if no path_parts returned 2017-07-19 16:46:37 +02:00
shortcutme
b88ee9a87a
Only allow to sign content.json files 2017-07-19 16:45:28 +02:00
shortcutme
2aba9cc3c2
Only download content.json files as content 2017-07-19 16:45:12 +02:00
shortcutme
961fcbf660
Rev2160, Fix sidebar typo 2017-07-18 22:39:48 +02:00
shortcutme
56c9ac8e46
Rev2159 2017-07-18 20:57:41 +02:00
shortcutme
1f7b25b60c
Ignore http protocol in same origin comparison 2017-07-18 20:57:33 +02:00
shortcutme
34ec05d4b4
Fix notification id collision 2017-07-18 20:55:53 +02:00
shortcutme
bf672bdec3
Add new test to unsafe matches 2017-07-18 20:55:04 +02:00
shortcutme
bb27e3124f
Remove files without info on retry bad files 2017-07-18 20:54:39 +02:00
shortcutme
551aa3ef67
Raise exception on unsupported dbschema version 2017-07-18 20:53:52 +02:00
ZeroNet
de550d7cae Merge pull request #1027 from cclauss/patch-2
Old style exceptions --> new style
2017-07-18 20:51:48 +02:00
cclauss
eaa344abca Update main.py 2017-07-16 22:57:28 +02:00
Andrew (anoa)
dc82f7ab3e
Small grammar fix 2017-07-15 00:30:25 -07:00
shortcutme
a6ce2a0253
Rev2156 2017-07-15 01:32:39 +02:00
shortcutme
a0d85d7d83
Prompt new site addition in raw mode 2017-07-15 01:32:15 +02:00
shortcutme
6a4882d81d
Test SafeRe repetition limit 2017-07-15 01:31:08 +02:00
shortcutme
ac1a03d17b
Don't allow more than 10 repetitions in one pattern 2017-07-15 01:30:53 +02:00
shortcutme
0e930efd95
Cache SafeRe patterns 2017-07-15 01:30:35 +02:00
shortcutme
d281f112d9
Rev2154, Fix same origin checking in proxy mode 2017-07-14 11:08:22 +02:00
shortcutme
5a42cb92cd
Rev2153 2017-07-14 10:37:19 +02:00
shortcutme
3459d35ed2
Test unsafe regex pattern recognization 2017-07-14 10:37:09 +02:00
shortcutme
699a8be721
Test unsafe patterns in dbschema 2017-07-14 10:36:41 +02:00
shortcutme
1f4a5643db
Test unsafe regex patterns on sign and verify 2017-07-14 10:36:18 +02:00
shortcutme
492408def7
Use class variable to store test site privatekey 2017-07-14 10:35:44 +02:00
shortcutme
74763465a8
Use SafeRe to match file patterns in dbschema.json 2017-07-14 10:34:57 +02:00
shortcutme
c069d4f67c
Use SafeRe to match user defined patterns in content.json 2017-07-14 10:34:18 +02:00
shortcutme
bf41c7b651
Detect potentionally unsafe regex patterns 2017-07-14 10:31:42 +02:00
shortcutme
3f5a5b4f9b
Rev2151 2017-07-13 19:33:16 +02:00
shortcutme
b60a1ec455
Test invalid filenames 2017-07-13 19:33:07 +02:00
shortcutme
13157eea1e
Move included content verification to separate function, fix root content.json file path verification 2017-07-13 19:32:54 +02:00
shortcutme
dd11f87673
Rev2148, Fix signing typo 2017-07-13 15:03:04 +02:00
shortcutme
87910a236b
Rev2147 2017-07-13 15:00:23 +02:00
shortcutme
096675c87e
Add unit to verification error 2017-07-13 15:00:04 +02:00
shortcutme
7d3beeb9e0
Enforce valid relative paths on verification 2017-07-13 14:59:17 +02:00
shortcutme
96a097e33d
Separate isValidRelativePath function 2017-07-13 14:58:52 +02:00
shortcutme
1bb3140f5b
Move file hashing to separate funcion to allow easier extension 2017-07-13 14:58:16 +02:00
shortcutme
6bf3d34c6c
Rev2145 2017-07-12 12:28:28 +02:00
shortcutme
3cd7e4e48e
Better way to strip pyc/pyd from config file path 2017-07-12 12:28:21 +02:00
shortcutme
e525ea2431
Rev2144, Fix CSP header in FilePack plugin, Allow media-src and font-src from self source 2017-07-11 23:00:33 +02:00
shortcutme
c8f37674c6
Rev2142, Fix random wrong data dir path 2017-07-11 21:03:24 +02:00
shortcutme
12ca870e38
Rev2141 2017-07-10 02:42:50 +02:00
shortcutme
f630e6c25e
Test raw access security 2017-07-10 02:42:41 +02:00
shortcutme
7c6bea6ddd
Fix raw site access without / at the site address end 2017-07-10 02:42:28 +02:00
shortcutme
efbef25c76
UserSetSettings, UserGetSettings Websocket API commands 2017-07-10 02:41:01 +02:00
shortcutme
1384da4691
Rev2137 2017-07-09 14:54:20 +02:00
shortcutme
426fe561c9
Cleanup not used wrapper opener check 2017-07-09 14:12:13 +02:00
shortcutme
5950b04c40
Add allow-origin header for media requests from same origin to fix css font support 2017-07-09 14:11:44 +02:00
shortcutme
434cfce32a
More simple same origin test for media files cross-site access 2017-07-09 14:11:06 +02:00
shortcutme
febdea6c64
Serve files without wrapper if requested using /raw/ prefix 2017-07-09 14:10:01 +02:00
shortcutme
6c0062dbc1
Rev2132 2017-07-06 00:09:47 +02:00
shortcutme
49735b7e55
Fix not internal error on request files from not seeded sites 2017-07-06 00:09:35 +02:00
shortcutme
1d6168f457
Download, svg, xml, flash, pdf files instead of displaying to avoid js execution 2017-07-06 00:09:05 +02:00
shortcutme
2a161f4421
Never allow cross-origin file request 2017-07-06 00:08:32 +02:00
shortcutme
f30b2b6fc2
Rev2130, Use SslPatch to load openssl library, Fix Android 6 openssl loading 2017-07-04 01:12:58 +02:00
shortcutme
ebbe19131b
Rev2128, Update to OpenSSL v1.0.2l 2017-06-30 10:13:25 +02:00
shortcutme
03cabcb07c
Rev2127, Fix delete files without file_info 2017-06-27 18:08:28 +02:00
shortcutme
401d3ec1c9
Rev2125, Fix missing if line 2017-06-21 00:03:26 +02:00
shortcutme
fd1f104f4e
Rev2124 2017-06-20 20:32:59 +02:00
shortcutme
66e2192e65
Add --silent option to disable logging to terminal 2017-06-20 20:32:51 +02:00
shortcutme
0d6d19502f
Format json reply for peerCmd command line action 2017-06-20 20:29:11 +02:00
shortcutme
a7b22e2055
Fix error on exit for peers without site 2017-06-20 20:28:35 +02:00
shortcutme
71fbcee76c
Fix error on exiting when there is no stream_server started 2017-06-20 20:28:09 +02:00
shortcutme
e157894694
Rev2122 2017-06-20 11:20:48 +02:00
shortcutme
f08f354eb6
More detailed file size match error logging 2017-06-20 11:20:43 +02:00
shortcutme
23db93d20f
Fix invalid update logging 2017-06-20 11:20:30 +02:00
shortcutme
67212ee29e
Rev2121 2017-06-19 16:19:04 +02:00
shortcutme
15d8589069
Fix typo, less verbose socket logging 2017-06-19 16:18:37 +02:00
shortcutme
14cd9315c1
Don't try to send to closed socket 2017-06-19 16:18:20 +02:00
shortcutme
f1786c2ee6
Handle unknown message type 2017-06-19 16:16:43 +02:00
shortcutme
7d9cb65ba1
Catch message type errors on connection parsing 2017-06-19 16:16:13 +02:00
shortcutme
9f72fdeb41
Display sign error on command line siteSign command failure 2017-06-19 16:14:36 +02:00
shortcutme
b7106995b7
Test size errors on getFile 2017-06-19 16:14:14 +02:00
shortcutme
dca3c775d1
Test expect exact sign and verification errors 2017-06-19 16:13:58 +02:00
shortcutme
916709a7e4
Allow less peer error if for popular sites 2017-06-19 16:13:06 +02:00
shortcutme
066f54f521
Only log listModification request in verbose mode 2017-06-19 16:12:41 +02:00
shortcutme
64199c7ded
Reduce logging on tracker error 2017-06-19 16:12:24 +02:00
shortcutme
79ca1069ec
Display exact sign error to UI on failure 2017-06-19 16:11:47 +02:00
shortcutme
43c8dacd70
Catch and log exact verification errors on worker download 2017-06-19 16:10:49 +02:00