oci/zeronet
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
4108 commits 10 branches 50 tags 16 MiB
Commit graph

2779 commits

Author SHA1 Message Date
shortcutme
13233d47bd
Fix long running test 2019-11-07 02:44:33 +01:00
Josh
74d7d92a4d Allow all valid filenames to be added to content.json (#2141) 
* Allow all valid filenames to be added to content.json

* Replace hex version of regex with non-hex version

* Add basic test for path validation with ASCII and UTF-8 filenames

* Amend path validation test to meet standards
 2019-11-07 02:18:27 +01:00
Lola Dam
1bfe328a1b No restart after update (#2242) 2019-11-01 19:36:43 +01:00
shortcutme
1f453b6c13
Rev4253, Hotfix siteCreate CLI 2019-10-30 03:09:28 +01:00
shortcutme
ee8e3c3c9c
Use master_seed for siteCreate CLI by default 2019-10-30 03:07:06 +01:00
shortcutme
37f315dfc2
Rev4252 2019-10-30 02:31:04 +01:00
shortcutme
1e1e560795
Use master seed to create new site from cli 2019-10-30 02:30:01 +01:00
shortcutme
8d88cfcd68
Fix notification width calculation 2019-10-30 02:28:37 +01:00
shortcutme
74badf9c9c
Rev4250 2019-10-28 16:44:40 +01:00
shortcutme
86087550f1
Log ConnectionResetError as warning 2019-10-28 16:44:14 +01:00
shortcutme
8dfc200f24
Update cachable type list 2019-10-28 16:43:37 +01:00
shortcutme
cb4a4bd707
Add utf-8 charset header to more types 2019-10-28 16:43:19 +01:00
shortcutme
24ba2a150b
Remove limitations for img, font, media, style src in raw mode 2019-10-28 16:42:28 +01:00
shortcutme
e1d92bf0ec
Changing allow-origin to js files looks no longer necessary 2019-10-28 16:41:55 +01:00
shortcutme
270f3e9ffd
Use host to check same origin if referrer looks trimmed to host 2019-10-28 16:41:08 +01:00
shortcutme
e1f73697ff
Extend built-in content types list 2019-10-28 16:11:45 +01:00
shortcutme
e82155aac4
Rev4245, Fix target=_blank links 2019-10-26 20:36:53 +02:00
shortcutme
d7669413af
Log ConnectionAbortedError as warning 2019-10-26 20:17:09 +02:00
shortcutme
28d4fc5d12
Update location of bundled OpenSSL on macOS 2019-10-24 12:22:54 +02:00
shortcutme
6bae1f8a4b
Rev4243 2019-10-24 03:09:38 +02:00
shortcutme
10ceeb7f02
Remove no longer necessary files after cert generation 2019-10-24 03:09:28 +02:00
shortcutme
448bb3ce98
Fix OpenSSL cert generation using LibreSSL 2019-10-24 03:09:16 +02:00
shortcutme
0531d47721
Fix shutdown errors on macOS 2019-10-24 03:08:45 +02:00
shortcutme
b21719e2f2
Fix OpenSSL lib loading on macOS 2019-10-24 03:08:27 +02:00
shortcutme
fa7013fdf7
Rev4241 2019-10-16 15:44:56 +02:00
shortcutme
608a411d97
Db table rebuild as debug message 2019-10-16 15:43:28 +02:00
shortcutme
20c63c73b3
Support silent loading of verify lib 2019-10-16 15:43:07 +02:00
shortcutme
127fa5fa82
Rev4238 2019-10-06 03:27:47 +02:00
shortcutme
63fd0a9fa1
Put the infopanel lower to avoid console interruption 2019-10-06 03:21:35 +02:00
shortcutme
344ad44854
Fix reload if there is hash in the url 2019-10-06 03:20:58 +02:00
shortcutme
43a5742258
Resolve domain in parsePath function 2019-10-06 03:20:16 +02:00
shortcutme
924a61309a
Cached isDomain / resolveDomain functions 2019-10-06 03:18:14 +02:00
shortcutme
9dd5c88da4
Monospace font when displaying errors 2019-10-06 03:15:57 +02:00
shortcutme
0598bcf332
Fix utf8 post data parsing 2019-10-06 03:15:20 +02:00
shortcutme
ead1b3e5f5
Log 403 as warning 2019-10-06 03:14:45 +02:00
shortcutme
dd493c87fa
Display WSGI errors to the browser 2019-10-06 03:13:32 +02:00
shortcutme
29640e614c
Admin API call to list server errors 2019-10-06 03:12:47 +02:00
shortcutme
73e0aa17c4
Don't encode byte responses 2019-10-06 03:10:43 +02:00
shortcutme
917a2e59ce
Fix compacting large json files 2019-10-06 03:10:20 +02:00
shortcutme
119e1a9bf0
Simple cache decorator 2019-10-06 03:09:48 +02:00
shortcutme
6eb79ba75e
Don't annunce site if not serving 2019-10-06 03:08:54 +02:00
shortcutme
bb436f9931
Rev4223 2019-09-28 17:17:47 +02:00
shortcutme
3682f0aed4
Wait for db close on tests 2019-09-28 17:03:43 +02:00
shortcutme
b21b885aa9
Move site add to separate function 2019-09-28 17:01:37 +02:00
shortcutme
f5829f6012
Rev4221 2019-09-19 16:38:20 +02:00
shortcutme
d7db631b95
Shut down UiServer if FileServer startup failed 2019-09-19 16:33:45 +02:00
shortcutme
93e6ec4933
Fix display site add prompt 2019-09-19 16:32:30 +02:00
shortcutme
dbcd8602c5
Rev4214 2019-09-15 22:12:09 +02:00
shortcutme
1793407748
Png and svg version of the logo 2019-09-15 22:12:03 +02:00
shortcutme
6f0d4a50d1
Add apple touch icon support for Safari 2019-09-15 22:11:51 +02:00
shortcutme
10817aefae
Fix pyelliptic OpenSSL 1.1 compatibility if it's also present in site-packages 2019-09-15 22:08:48 +02:00
shortcutme
4293a44c93
Don't try to find OpenSSL 1.0.x 2019-09-15 22:08:20 +02:00
shortcutme
96759e9303
Rev4210, Fix format exception if no args 2019-09-12 00:24:16 +02:00
shortcutme
448483371c
Formatting 2019-09-12 00:23:36 +02:00
Lola Dam
0738964e64 Save content.json of site even if limit size is reached (#2114) 
* fix #2107; Still save the content.json received even if site size limit is reached but dont download files; Allow better distribution of latest version of content.json

* Added test

* Fix test for huge content file (now it fails)

* Dont download huge content.json file and update test

* Remove comments
 2019-09-10 18:18:21 +02:00
shortcutme
2de35266c4
Rev4208, Add details on Tor connection error 2019-09-10 15:43:42 +02:00
krzotr
55c7585334
Set custom priority in FileNeed and FileGet command 
When you use `FileNeed` or `FileGet` command the default priority is set to `6`.
You cannot change that value because is hardcoded.

Now you can set priority of downloading files manually:

```
this.cmd("fileNeed", {
    "inner_path": inner_path + "|all",
    "priority": 10
})
```
 2019-09-08 11:51:46 +02:00
shortcutme
62d278a367
Version 0.7.1 2019-09-06 04:03:01 +02:00
shortcutme
38e20b7c31
Rev4206 2019-09-04 20:16:57 +02:00
shortcutme
d3fce8ca36
Support Linux bundle OpenSSL 2019-09-04 20:16:32 +02:00
shortcutme
0b04176f18
Rev4203, Change console encoding to utf8 on Windows 2019-09-03 12:00:25 +02:00
Ivanq
5da4537d7c
Fix gevent.Timeout being not caught 2019-09-02 19:34:29 +00:00
Ivanq
500c96abe2
Fix UnicodeDecodeError when OpenSSL is not found 
Fixes #2180
 2019-09-02 14:35:28 +00:00
shortcutme
149c4f5c7b
Rev4200 2019-09-02 14:17:46 +02:00
shortcutme
f999f167b1
Offer access with ip address on invalid host error 2019-09-02 02:10:52 +02:00
shortcutme
9ac96cdd50
Don't leak allowed origins in error message 2019-09-02 02:09:53 +02:00
shortcutme
912c958ac0
Rev4197 2019-08-26 03:21:04 +02:00
shortcutme
1bd1ddf410
Test function flagging 2019-08-26 03:15:29 +02:00
shortcutme
7890771faa
Test permissions of websocket 2019-08-26 03:11:24 +02:00
shortcutme
376fd0d439
Use flags instead of permission list 2019-08-26 03:09:48 +02:00
shortcutme
c414e6caa2
Support action async call flag 2019-08-26 03:08:57 +02:00
shortcutme
ed7a3b2356
Get action permissions from flag db 2019-08-26 03:02:30 +02:00
shortcutme
adffbd1973
New function flagging decorator class to keep track permissions 2019-08-26 02:55:01 +02:00
shortcutme
6750682e4f
Rev4191 2019-08-23 03:42:31 +02:00
shortcutme
ab9fe173a8
Don't use trackers proxy in tor always mode 2019-08-23 03:40:29 +02:00
shortcutme
8a7ae368d8
No opened services if we are in tor always mode 2019-08-23 03:40:20 +02:00
shortcutme
248fc5f015
Use re.sub to replace template variables 2019-08-23 03:39:50 +02:00
shortcutme
e16611f15a
Allow websocket connection originates from earlier accepted hostnames 2019-08-23 03:39:16 +02:00
Ivanq
24b3651d2e Allow blob: protocol (#2166) 
* Allow blob: protocol

* Fix quotes
 2019-08-20 12:42:01 +02:00
Ivanq
61ba9848e5 Add --merge_media config option 2019-08-20 08:16:35 +00:00
Ivanq
01ff89315b Add GitLab CI/CD support (#2163) 
* Use GitLab CI/CD

* Force colored tests

* Get rid of an error

* Mark tests as slow

* Disable codecov & coveralls

* Python 3.5-3.8

* Add Python 3.4

* Support both OpenSSL 1.1.0 and 1.1.1+

* Test both OpenSSL 1.1.0 and 1.1.1+

* Fix OpenSSL 1.1.1

* Fix Python 3.4 build
 2019-08-19 17:30:31 +02:00
shortcutme
155d8d4dfd
Rev4188, Allow only white listed values for open_browser 2019-08-19 13:42:49 +02:00
Ivanq
1ed40b3b82
Allow files with .. as a name substring 2019-08-19 07:09:32 +00:00
shortcutme
18dc359cfc
Rev4187 2019-08-18 03:03:22 +02:00
shortcutme
b871849df4
Add origin validation to websocket connections 2019-08-18 03:03:02 +02:00
shortcutme
7d1ca3862d
Make missing IPv6 a warning not an error 2019-08-18 03:02:30 +02:00
shortcutme
2a887870ff
Rev4185 2019-08-17 20:35:00 +02:00
shortcutme
8537939d26
Disable UDP in proxy mode 2019-08-17 20:34:04 +02:00
shortcutme
fcb3ac3917
Only change default proxy to tor in tor always mode 2019-08-17 20:33:43 +02:00
shortcutme
d63a4b3912
Rev4181 2019-08-15 03:19:23 +02:00
shortcutme
6a245a202c
Fix server connections encryption 2019-08-15 03:19:05 +02:00
shortcutme
429043f60c
CLI peerPing command display connection encryption info only once 2019-08-15 03:09:53 +02:00
shortcutme
8f491fe6e1
Use SSLContext for connection encryption, add fake SNI, ALPN 2019-08-15 03:08:40 +02:00
shortcutme
92358bafc0
Wider max notification width to allow blacklist button in same line 2019-08-15 03:06:13 +02:00
shortcutme
d93e89899b
Fix tracker proxy PySocks import 2019-08-15 03:05:46 +02:00
shortcutme
2bdd073608
Move resolveDomain to SiteManager for easier resolver plugins 2019-08-15 03:05:29 +02:00
shortcutme
7801937f74
Rev4176, Fix update of plugins 2019-08-13 21:07:26 +02:00
shortcutme
1d7e0c47dd
Merge branch 'py3' of https://github.com/HelloZeroNet/ZeroNet into py3 2019-08-12 17:58:28 +02:00
shortcutme
7b9b48e62d
Rev4175, Console and file logging disable support 2019-08-12 17:58:23 +02:00
Ivanq
3f7e22497d
Fix preferring CLI argument over zeronet.conf 
Fix using open_browser from CLI arguments in case there are several `--open_browser` arguments, which often happens after restarts.
 2019-08-11 12:18:55 +03:00
shortcutme
e745760520
Rev4172 2019-08-09 13:18:57 +02:00
shortcutme
bd5c2b1daa
Also try to load OpenSSL dll from Python/DDLs directory 2019-08-09 13:18:40 +02:00
shortcutme
30865c9d1c
Rev4169 2019-08-08 23:37:49 +02:00
shortcutme
1cfe874893
Use find_library first to locate libeay32 2019-08-08 23:37:43 +02:00
shortcutme
5da46ca29c
Cleanup whitespace in pyelliptic 2019-08-08 23:37:21 +02:00
shortcutme
cc21cbd1bd
Use relative import in pyelliptic 2019-08-08 23:36:58 +02:00
shortcutme
79ba4a9d23
Rev4167 2019-08-08 14:39:02 +02:00
shortcutme
44ef0cbe59
Always load plugins abc sorted 2019-08-08 14:37:42 +02:00
shortcutme
88f2b39576
Don't try to connect to onion addresses if not supported by the client 2019-08-08 14:37:19 +02:00
shortcutme
bf10cdef63
Add some delay on pex error before try the next peer 2019-08-08 14:36:33 +02:00
shortcutme
3696db89ab
Don't increment tracker error number if no internet connection 2019-08-08 14:35:58 +02:00
shortcutme
eeaa5d21d8
Start unrealible trackers on force reannounce 2019-08-08 14:35:35 +02:00
shortcutme
f4bec3bb4d
Avoid starting new workers on possibly unvalaible file 2019-08-08 14:35:04 +02:00
shortcutme
b5a1310add
Rev4165 2019-08-07 14:12:53 +02:00
shortcutme
b22343f65c
Support multiple trackers_file argument 2019-08-07 14:12:45 +02:00
shortcutme
b9b317e213
Remove accidently left print on plugin load 2019-08-07 14:11:58 +02:00
shortcutme
6cd18bbf04
Display more clean error on users.json/sites.json load error 2019-08-07 14:11:30 +02:00
shortcutme
b6e1559a80
Rev4163 2019-08-03 01:35:37 +02:00
shortcutme
39f318fbd5
Add plugin version information to server_info 2019-08-03 01:34:21 +02:00
shortcutme
21def81439
Fix js, css merging with absolute merged_path 2019-08-03 01:34:00 +02:00
shortcutme
f40c3e6b81
Add notification messages max-width 2019-08-02 20:11:00 +02:00
shortcutme
bb705ae863
Fix source code reloader crash on directory modifications/file deletions 2019-08-02 16:19:35 +02:00
shortcutme
c4a3a53be0
Also reload source code on file changes in installed plugins 2019-08-02 16:19:05 +02:00
shortcutme
713ff17e91
Allow load installed third-party plugins and enable/disable plugins in config file data/plugins.json 2019-08-02 16:18:37 +02:00
shortcutme
0c659a477d
Remove hard-coded translate files directory 2019-08-02 16:16:19 +02:00
shortcutme
26678a65f8
Limit notifications max with 2019-08-02 16:15:45 +02:00
shortcutme
c5116fb318
Modify testAction command to use handleRequest instead of directly calling the function 2019-08-02 16:14:44 +02:00
shortcutme
fbafd23177
Add OpenSSL 1.1 support to CryptMessage plugin by using radfish's pyelliptic version 2019-08-02 16:13:54 +02:00
shortcutme
1eb97ea381
Delayed save of sites.json 2019-08-02 14:06:25 +02:00
shortcutme
f6e06456b0
Use advaced json dumper to save sites.json and users.json 2019-08-02 14:06:05 +02:00
shortcutme
5e90cd9714
Move advanced json formatter to helper.py 2019-08-02 14:05:14 +02:00
shortcutme
06406fa46c
Avoid bare exceptions 2019-08-02 14:04:18 +02:00
Filip Š
5b91aef4ec
Add response to some commands 2019-08-01 19:16:10 +02:00
shortcutme
d8a121cd06
Rev4129 2019-07-18 03:34:09 +02:00
shortcutme
902a1b1c88
Fix OpenSSL dll loading on Windows 2019-07-18 03:33:56 +02:00
shortcutme
c9a2b86c16
Log possible OpenSSL cert generation error message at the same line 2019-07-18 03:33:35 +02:00
shortcutme
27fcb70774
Log loaded verify lib path and load time 2019-07-18 03:32:45 +02:00
shortcutme
6cffa1c0ca
Change maxstdio using ctypes as win32file module is not included with Python3 by default 2019-07-18 03:31:57 +02:00
shortcutme
d3e8fcea47
Rev4126 2019-07-17 16:31:38 +02:00
shortcutme
149278abd0
Skip reload on attribute changes 2019-07-17 16:30:56 +02:00
shortcutme
314c8b22db
Fix parsing config file with % in value 2019-07-17 16:30:32 +02:00
Vadim Ushakov
a2cb1615b3 Move the BitTorrent related code from SiteAnnouncer.py (#2078) 
* Move the BitTorrent related code from SiteAnnouncer.py to a separate plugin

* AnnounceBitTorrentPlugin.py: add missing `from Debug import Debug`
 2019-07-10 16:12:25 +02:00
shortcutme
356d0521e6
Rev4122 2019-07-10 03:15:56 +02:00
shortcutme
5a08ab93d3
Ignore file attribute changes when reloading source code 2019-07-10 03:15:46 +02:00
shortcutme
8185f4dfda
Test getFile inner_path security 2019-07-10 03:14:30 +02:00
shortcutme
f4f0e2afa8
Allow like parameters in database queries 2019-07-10 03:14:09 +02:00
shortcutme
67d6b1e724
Fix double logging when running tests 2019-07-10 03:12:56 +02:00
Filip Š
87b4500467 Fix infinite reloading when system theme changes 2019-07-05 18:43:54 +02:00
ZeroNet
951e47469a
Merge pull request #2060 from imachug/default-subdir-clone 
Fix siteCloning subdirectory with -default files
 2019-07-05 17:13:29 +02:00
shortcutme
c1db963c76
Rev4112, Fix loading screen glitch, Change unstable trackers 2019-07-04 14:39:41 +02:00
Ivanq
33b478199a
Guess content type correctly 
Fix e.g. vue.min.js being reported as text/plain instead of text/javascript.
 2019-07-04 12:09:07 +03:00
shortcutme
21f285e099
Rev4111 2019-07-03 18:37:35 +02:00
shortcutme
fec312ed09
Better pytest atexit logging error workaround 2019-07-03 18:37:13 +02:00
shortcutme
eb2627721e
Fix pytest 5.x compatibility 2019-07-03 18:36:41 +02:00
shortcutme
ff32f822ba
Raise exception instead of using assert 2019-07-03 18:35:55 +02:00
Ivanq
743f92d15e Allow some paths to contain .. but not ../ 2019-07-01 18:17:42 +03:00
shortcutme
822dec5c03
Rev4110 2019-07-01 16:28:56 +02:00
shortcutme
40b84755de
Add some fixed content_type 2019-07-01 16:28:37 +02:00
shortcutme
1b307166ee
Formatting 2019-07-01 16:27:40 +02:00
shortcutme
7a483e7912
Add short address to site_info 2019-07-01 16:27:34 +02:00
shortcutme
841230fe80
Call onClosed function if websocket is disconneced 2019-07-01 16:27:20 +02:00
shortcutme
900ae4e1ea
Remove notification about port open status on startup 2019-07-01 16:26:57 +02:00
shortcutme
72b6d6c676
Make wrapper compatible with sidebar console function 2019-07-01 16:26:37 +02:00
shortcutme
f979ed133f
Workaround for pytest 0.4.1+ atexit logging errors 2019-07-01 16:25:45 +02:00
shortcutme
fb2cf5f04d
More detailed logging of file change event 2019-07-01 16:24:48 +02:00
shortcutme
62401b24ec
Add r string literal for regexps 2019-07-01 16:24:23 +02:00
shortcutme
43f833e604
Allow multiple values of same key in the config file 2019-07-01 16:20:13 +02:00
shortcutme
612a3f4401
Fix parsing config file for lines that has no values 2019-07-01 16:19:32 +02:00
Ivanq
8eee9caa01 Fix siteCloning subdirectory with -default files 2019-07-01 09:49:03 +03:00
Ivanq
d278a30d19 Allow sites to lock pointer (#2059) 
Add `allow-pointer-lock` to iframe sandbox
 2019-06-30 16:39:17 +02:00
Lola Dam
753396ac0c Try and catch block for dbRebuild (#2047) 
* Try and catch block for dbRebuild

* Use self.log.error and not logging

* Use self.log.error and not logging in SiteStorage also

* Check if the rebuild is working
 2019-06-23 14:21:50 +02:00
shortcutme
9a267ffcaf
Rev4016, Fix updater 2019-06-12 02:57:18 +02:00
ZeroNet
6254143fc6
Fix noparallel ignoreclass test 2019-06-11 18:24:44 +02:00
shortcutme
862e19a263
Rev4104, Don't start blocking Noparallel calls in separate greenlet to be able to catch exceptions. 2019-06-11 17:04:37 +02:00
shortcutme
eeef6fe65f
Rev4102, Fix fileGet test 2019-06-06 03:17:42 +02:00
shortcutme
63d7e73cff
Rev4101 2019-06-06 02:49:11 +02:00
shortcutme
8cb629fb55
Return True on rebuildDb success 2019-06-06 02:27:59 +02:00
shortcutme
d596f28f46
Log non-file read errors on fileGet 2019-06-06 02:27:35 +02:00
shortcutme
45fea827af
Rev4100 2019-06-04 16:18:59 +02:00
shortcutme
bb7af2e8ed
Fix closing progress notification at 100% 2019-06-04 16:18:02 +02:00
Lola Dam
9cda561091 Show error message when db failed to rebuild (#2043) 
* Show error message when db failed to rebuild; fix #1908;

* Forgot file
 2019-06-04 13:54:35 +02:00
shortcutme
d38846f126
Rev4099, Fix ZipStream for older Python versions 2019-05-31 15:08:30 +02:00
shortcutme
3b764439af
Rev4098 2019-05-30 04:29:57 +02:00
shortcutme
6c4440c2d1
Less verbose Tor controller logging 2019-05-30 04:28:57 +02:00
shortcutme
8e2a7c2b2d
Respect optionalHelp when checking files 2019-05-30 04:28:41 +02:00
shortcutme
fce30baa12
Check files in offline mode on update 2019-05-30 04:28:09 +02:00
shortcutme
4222c31b3e
Don't push body of content.json with updates if larger than 10kb 2019-05-30 04:26:41 +02:00
shortcutme
e5d3b0e7b8
Use openssl from tools directory on Windows 2019-05-30 04:24:58 +02:00
shortcutme
1bba253156
Rev4094 2019-05-29 16:03:32 +02:00
shortcutme
a2d29a4531
Only display sign error if there is no stored privatekey 2019-05-29 16:03:10 +02:00
shortcutme
589869c5ed
Move progress display to separate function 2019-05-29 16:02:34 +02:00
Lola Dam
7262fbfb4e Added optional redirect value for siteClone (#2032) 
* Added optional redirect value; see #1891

* Return address of the newly cloned site
 2019-05-28 18:05:52 +02:00
Lola Dam
9c0e8ee833 Better error message if private key not stored when assigning (#2033) 
* Return a more instructive message in case the privatekey is not found when attempting to sign

* Fix typo
 2019-05-28 18:04:49 +02:00
Ivanq
9119d72b9b Fix calling start.py to reopen browser (#2029) 
* Fix calling start.py to reopen browser

* Move below
 2019-05-24 16:36:29 +02:00
shortcutme
891aac4713
Rev4093 2019-05-21 15:57:49 +02:00
shortcutme
2fa006d74e
Fix loading json files with utf8 content 2019-05-21 15:54:36 +02:00
shortcutme
a6c97a304f
Remove empty exception from config.py 2019-05-21 15:53:53 +02:00
shortcutme
cfa4f8fa63
Fix log_dir exception on startup fail 2019-05-21 15:53:32 +02:00
ZeroNet
25d6eea906
Merge pull request #2026 from imachug/js-modules 
ECMAScript modules
 2019-05-20 17:06:17 +02:00
ZeroNet
4e819ac035
Merge pull request #2025 from imachug/fileneed-timeout 
Handle fileNeed timeout
 2019-05-20 17:05:23 +02:00
Ivanq
ed85981409 Fix JS modules 2019-05-19 15:45:34 +03:00
Ivanq
5d920ff7df Handle gevent.Timeout error 2019-05-19 15:42:11 +03:00
cclauss
8962c16670
Declare 'err' because Python 3 has stricter scoping rules 
I Python 3, __err__ will go out of scope after the __try / except__ block.  This change preserves the value after the end of the __try / except__ block.
 2019-05-17 12:33:10 +02:00
shortcutme
20371895c9
Rev4090, Remove fs paths from error responses 2019-05-02 18:02:56 +02:00
shortcutme
617027eb52
Rev4089, Support compressed addresses in libsecp256k1 sign verification 2019-05-02 17:38:36 +02:00
shortcutme
6b9106b178
Test verify of compressed and uncompressed address signature 2019-05-02 17:18:31 +02:00
shortcutme
6207ccd559
Fix pex result parsing when there is no connection 2019-05-02 17:17:57 +02:00
shortcutme
043ac5a510
Log renaming 2019-05-02 17:17:00 +02:00
shortcutme
f318f76994
Add missing function 2019-04-29 17:18:02 +02:00
shortcutme
fd085d2d37
Rev4086, Fix verify content.json files without files_optional 2019-04-29 16:54:07 +02:00
shortcutme
327f580218
Rev4085 2019-04-29 16:44:19 +02:00
shortcutme
7bef78e10f
Fix newsfeed sql query with many parameters 2019-04-29 16:44:13 +02:00
ZeroNet
c2ab102c0e
Merge pull request #1999 from filips123/py3 
Support for detection of system's theme
 2019-04-29 16:35:55 +02:00
Ivanq
4f09a5111b Build wrapper all.js to support web notifications 2019-04-27 18:19:16 +03:00
Filip Š
baf820bcdb Support for detection of system's theme 2019-04-26 18:23:25 +02:00
ZeroNet
2b9f1257be
Merge pull request #1993 from imachug/notifications 
Support web notifications
 2019-04-26 12:58:18 +02:00
Ivanq
6e58e8d50f Don't require WebNotifications permission 2019-04-26 12:55:33 +03:00
shortcutme
021b822c4f
Rev4080 2019-04-23 02:01:40 +02:00
shortcutme
4ac54845fc
Fix double logging when testing 2019-04-23 02:00:59 +02:00
shortcutme
e688671972
Fix rename error variable problem in site storage 2019-04-23 01:59:59 +02:00
shortcutme
6bd63ff42a
Test file renames 2019-04-23 01:59:12 +02:00
shortcutme
4ca0e6b781
Support file renames in content.json if the sha512 hash is the same 2019-04-23 01:56:11 +02:00
shortcutme
4bfd4bd714
Rev4074, Fix Ecdsa functions in cryptmessage plugin 2019-04-20 09:48:56 +02:00
Ivanq
9ddb984004 Rename Push notifications to Web notifications 2019-04-19 22:19:25 +03:00
Ivanq
e618c0e9ef Add closePushNotification 2019-04-19 22:19:25 +03:00
Ivanq
b55d2b53df Support Notification API 2019-04-19 22:19:25 +03:00
shortcutme
afbacdfc96
Rev4073 2019-04-18 12:23:55 +02:00
shortcutme
5842441062
Remove unused function 2019-04-18 12:22:57 +02:00
shortcutme
f083301b4c
Allow larger packets 2019-04-18 12:22:38 +02:00
shortcutme
8edbecce3c
Fix diffing 2019-04-18 12:21:59 +02:00
shortcutme
b114c52c0d
Allow pluginned classes in memory on reload 2019-04-18 12:21:50 +02:00
redfish
7e57a8f71e Ui,Translate: remove bytearray format string 
Py 3.4 does not support bytearray format strings
for % operator: b"%s" % s
 2019-04-16 20:54:55 -04:00
shortcutme
5ff2f792e6
Rev4070, Fix Multiuser plugin import order, Run coverage before optional plugins 2019-04-15 22:54:17 +02:00
shortcutme
8246505289
Rev4069 2019-04-15 22:48:55 +02:00
shortcutme
f970815645
Run tests in debug mode 2019-04-15 22:48:16 +02:00
shortcutme
f83c77e7ea
Fix plugin error message 2019-04-15 22:48:09 +02:00
shortcutme
654cce92cd
Rev4068 2019-04-15 22:24:00 +02:00
shortcutme
bc39e52f56
Rev4066 2019-04-15 22:20:16 +02:00
shortcutme
a822238735
Use 1544 port for tor in tests 2019-04-15 22:19:38 +02:00
shortcutme
b168772d7f
Create user for tests if necessary 2019-04-15 22:19:16 +02:00
shortcutme
034e104c06
Log fileserver startup error for tests 2019-04-15 22:19:00 +02:00
shortcutme
0c0f117bc3
Don't parse config file for tests 2019-04-15 22:18:40 +02:00
shortcutme
1d4ab8833b
Test and enforce proper import plugin order in debug mode 2019-04-15 22:18:18 +02:00
shortcutme
446641c31c
Always commit before Db VACUUM 2019-04-15 22:11:44 +02:00
shortcutme
572d55752c
Avoid random websocket test fails 2019-04-15 16:54:49 +02:00
shortcutme
04394d8ced
Rev4064 2019-04-15 16:29:01 +02:00
shortcutme
c7ea66bfef
Fix shutdown before file_server started 2019-04-15 16:07:18 +02:00
shortcutme
bfc5e2dce6
Support live changing offline mode 2019-04-15 15:49:53 +02:00
shortcutme
a7e8293d1a
Add offline mode info to server info 2019-04-15 15:49:34 +02:00
shortcutme
698f0cc230
Fix isServing check in site info formatting 2019-04-15 15:49:04 +02:00
shortcutme
f414f0746c
Don't update site in offline mode 2019-04-15 15:48:16 +02:00
shortcutme
235b8f359c
Don't create new connections in offline mode 2019-04-15 15:47:17 +02:00
shortcutme
2326cf3de8
Ignore incoming connections in offline mode 2019-04-15 15:47:05 +02:00
shortcutme
b8879853d5
Support closing all current connection in ConnectionServer 2019-04-15 15:46:53 +02:00
shortcutme
498fd4bf01
Don't listen ConnectionServer if not started 2019-04-15 15:46:37 +02:00
shortcutme
996f326c74
Store if UiServer is running 2019-04-15 15:45:07 +02:00
shortcutme
43b68faf73
Merge Ui all.js 2019-04-15 15:44:04 +02:00
shortcutme
8429ad7db7
Use global ZeroNet-Internal url to access Websocket 2019-04-15 15:42:24 +02:00
shortcutme
879b522914
Disable portcheck in offline mode 2019-04-15 15:16:38 +02:00
shortcutme
be584aa3d1
Change offline mode in /Config page 2019-04-15 15:12:08 +02:00
shortcutme
998ec3eb4f
Disable all site serving using a global offline argument 2019-04-15 15:06:25 +02:00
radfish
f6e3a74567 [setuptools packaging] access modules via imports (#1969) 2019-04-15 12:31:33 +02:00
shortcutme
0260b30335
Rev4059 2019-04-12 15:03:58 +02:00
shortcutme
0f72085c2a
Also return ws error to websocket connection 2019-04-12 15:03:43 +02:00
shortcutme
6ad8a10f37
Fix invalid ws request response value 2019-04-12 15:03:19 +02:00
shortcutme
8a38983dfc
Better logging of ws connection for siteCmd CLI action 2019-04-12 15:02:04 +02:00
shortcutme
9f5600b7f7
Rev4057, Log invalid result from websocket 2019-04-11 16:33:36 +02:00
shortcutme
a7632889a2
Rev4056 2019-04-11 01:30:04 +02:00
shortcutme
58a4bf479c
Only send env details if in debug mode 2019-04-11 01:29:56 +02:00
shortcutme
1ce4f99b80
Send noscript header to error messages and OPTIONS request 2019-04-11 01:29:32 +02:00
shortcutme
f94ecb3ec5
Fix error 404 on uimedia route 2019-04-11 01:28:00 +02:00
shortcutme
a5c7e59601
Rev4054, Escape error detail to avoid XSS (reported by krzotr) 2019-04-11 00:37:55 +02:00
shortcutme
ec81965393
Rev4053 2019-04-10 19:59:56 +02:00
shortcutme
21536b8948
More clear logging when pinging unencrypted connections 2019-04-10 19:59:37 +02:00
shortcutme
100c2c8741
Set serial by command line to avoid .srl file creation 2019-04-10 19:59:02 +02:00
shortcutme
d47e4a3e0e
More detailed error logging on ssl handshake fail 2019-04-10 19:58:37 +02:00
shortcutme
0c9ea8f580
Merge branch 'py3' of https://github.com/HelloZeroNet/ZeroNet into py3 2019-04-10 14:57:32 +02:00
shortcutme
2320eb8723
Rev4052 2019-04-10 14:57:24 +02:00
shortcutme
17bbeefeca
Fix getWebsocket 2019-04-10 14:57:06 +02:00
shortcutme
31372e269d
Give notification to all connected clients about ZeroNet update 2019-04-10 14:56:47 +02:00
shortcutme
ac799a60da
Stop fs watcher with UiServer 2019-04-10 14:56:10 +02:00
radfish
6a1d716ba1 test: refer to test data path via variable (#1964) 2019-04-10 11:30:35 +02:00
ZeroNet
8370ac8426
Merge pull request #1970 from radfish/PR-py3--import-plugins 
[setuptools packaging] PluginManager: get plugins path via import
 2019-04-09 17:51:05 +02:00
shortcutme
a20ff59572
Rev4050 2019-04-09 16:21:46 +02:00
shortcutme
c7078be407
Always verify client update 2019-04-09 15:07:56 +02:00
shortcutme
718a00974b
Merge js 2019-04-09 15:06:33 +02:00
shortcutme
d612676a80
Log closing websocket when updating event 2019-04-09 15:06:27 +02:00
shortcutme
d7bcfb415b
Fix js merging white space stripping 2019-04-09 15:06:09 +02:00
shortcutme
6928a17e61
Rev4048 2019-04-08 18:15:23 +02:00
shortcutme
d097092e8e
Merge js 2019-04-08 18:15:02 +02:00
shortcutme
79eb6573be
Support listing bad files with API 2019-04-08 18:14:45 +02:00
shortcutme
ffed8c9181
Add updatesite, dist_type, verify lib to serverinfo for admin sites 2019-04-08 18:14:31 +02:00
shortcutme
ff8573635d
Limit max width of notification 2019-04-08 18:13:58 +02:00
shortcutme
643244ffd1
Less visible changed files notification number 2019-04-08 18:13:18 +02:00
shortcutme
9fd059aef8
Give admin permission to updater site 2019-04-08 18:12:58 +02:00
shortcutme
6764a7ad2f
Fix js merging 2019-04-08 18:12:43 +02:00
shortcutme
5642d0aae6
Also ignore db -wal and -shm temp db files when signing 2019-04-08 18:12:29 +02:00
redfish
73814550e5 PluginManager: get plugins path via import 
* skip __pycache__ when loading
 2019-04-07 18:50:23 -04:00
ZeroNet
edf3cf3b65
Merge pull request #1966 from radfish/PR-py3--ui-pathlib 
[setuptools packaging] Ui: extend actionFile to accept pathlib.Path
 2019-04-07 12:01:07 +02:00
redfish
1e1f967292 Ui: extend actionFile to accept pathlib.Path 2019-04-06 22:22:34 -04:00
redfish
6f5d4fdc51 config: path.expanduser returns py3 strings 
And strings have no decode method.
 2019-04-06 22:16:37 -04:00
shortcutme
7b1594c69c
Rev4044 2019-04-04 13:29:36 +02:00
shortcutme
6d27feba97
New updater site for Python3 version 2019-04-04 13:29:26 +02:00
shortcutme
4363dcbbc1
Distribtion type config value for future support in the updater script 2019-04-04 13:29:11 +02:00
shortcutme
380c32dee2
Worker stats on stop 2019-04-04 13:27:46 +02:00
shortcutme
bfc7e7c33f
Only start worker if there is valid task for it 2019-04-04 13:27:21 +02:00
shortcutme
8594e4ce4a
Add reason for startWorkers 2019-04-04 13:27:06 +02:00
shortcutme
752dabe554
Openssl dll find patch to libeay32 2019-04-04 13:25:10 +02:00
tangdou1
42de962cbf
ipv6 compatibility 2019-04-03 19:56:14 +08:00
redfish
941571f71f file: set error message before using it 
Fixes this exception:

Unhandled exception: [(<class 'UnboundLocalError'>,
UnboundLocalError("local variable 'err' referenced before assignm>
 Traceback (most recent call last):
   File "src/gevent/greenlet.py", line 766, in gevent._greenlet.Greenlet.run
   File "/opt/zeronet/src/util/RateLimit.py", line 57, in <lambda>
     thread = gevent.spawn_later(time_left, lambda: callQueue(event))  # Call this function later
   File "/opt/zeronet/src/util/RateLimit.py", line 42, in callQueue
     return func(*args, **kwargs)
   File "/opt/zeronet/src/File/FileRequest.py", line 185, in actionUpdate
     self.response({"error": "File invalid: %s" % err})
UnboundLocalError: local variable 'err' referenced before assignment
 2019-03-31 16:25:26 -04:00
shortcutme
5df8e10b95
Rev4033 2019-03-29 02:31:46 +01:00
shortcutme
bddf2d6537
Fix fileGet command 2019-03-29 02:31:14 +01:00
shortcutme
3d05bdcb63
Log file command errors 2019-03-29 02:31:05 +01:00
shortcutme
52e28eefce
Use lowercase filename for content type guess 2019-03-29 02:30:43 +01:00
shortcutme
b5b0626251
Add name for websocket event on site deletion 2019-03-29 02:30:26 +01:00
shortcutme
4a4f311cf8
Better logging of cert generation 2019-03-29 02:29:55 +01:00
shortcutme
bad4d14cf6
Save OpenSSL rand file in data directory to avoid error message on Windows 2019-03-29 02:29:32 +01:00
shortcutme
b814a633c6
Don't reset broken ssl client list on cleanup 2019-03-29 02:28:46 +01:00
shortcutme
73524d70dc
Switch back to default log file naming because of broken rotate file deleting 2019-03-29 02:28:03 +01:00
shortcutme
41cd7da5bd
Rev4026 2019-03-27 03:13:14 +01:00
shortcutme
3d975fd767
Fix libeay32.dll location 2019-03-27 03:12:21 +01:00
shortcutme
f8f857c820
Fix atomicWrite non existing tmpold removal 2019-03-27 03:12:02 +01:00
shortcutme
9546ed0bb6
Try to connect to tor before starting own one under windows 2019-03-27 03:11:38 +01:00
shortcutme
a3f957427f
Make sure the test went without unnecessary reconnects 2019-03-27 03:10:58 +01:00
shortcutme
9b36c55422
Fix pytest warning 2019-03-27 03:10:29 +01:00
shortcutme
b6286372fb
Better cleanup after tests 2019-03-27 03:10:21 +01:00
shortcutme
74e71a1971
Fix http tracker announce compatibility 2019-03-27 03:09:47 +01:00
shortcutme
9050f1a039
Show crypto cipher on peerPing command 2019-03-27 03:09:28 +01:00
shortcutme
de303bf453
Modern crypto ciphers 2019-03-27 03:09:09 +01:00
shortcutme
3d8d3a9237
Randomize SSL subject (merged ValdikSS's commit) 2019-03-27 03:08:37 +01:00
shortcutme
cf354d59fb
Fix incoming connection implicit crypt 2019-03-27 03:06:46 +01:00
shortcutme
63e405c27e
Rev4022 2019-03-23 03:42:26 +01:00
shortcutme
33e8c6fb73
Fix ipv6 port checker 2019-03-23 03:41:52 +01:00
shortcutme
faba28dd94
Proper handle of sigterm signal, log reason of shutdown 2019-03-23 03:41:42 +01:00
shortcutme
a82ee338ef
Rev4017, Fix Bigfile test, Python 3.4 compatibility 2019-03-21 02:48:21 +01:00
shortcutme
60405bf222
Rev4016, Add ad test Python 3.4 compatibility 2019-03-21 02:22:22 +01:00
shortcutme
32329c1817
Rev4015 2019-03-20 01:06:56 +01:00
shortcutme
4aee7a6c61
Make openLocked always return BlockingIOError on fail 2019-03-20 01:05:52 +01:00
shortcutme
e6c2937c1b
Rev4014 2019-03-20 00:50:44 +01:00
shortcutme
8c52038671
Switch to WAL mode as it's faster on older sqlite 2019-03-20 00:49:51 +01:00
shortcutme
7aff97b6ff
Fix loading json files to db on Python 3.5 2019-03-20 00:49:27 +01:00
shortcutme
77530f13ee
Fix content.json update and verify on Python 3.5 2019-03-20 00:48:51 +01:00
shortcutme
0a1c22530a
More clear paramter name for verify 2019-03-20 00:48:09 +01:00
shortcutme
e6c0fe0370
OpenSSL config file to lib dir 2019-03-20 00:47:43 +01:00
shortcutme
63ba0a5551
Fix tests on Python 3.5 2019-03-20 00:46:57 +01:00
shortcutme
c7bfe0d537
Fix Upnp test 2019-03-20 00:46:16 +01:00
0polar
de91f7ec15
Fix "no module" error 
Since added into pip requirements.txt, no need to `from...`
 2019-03-19 20:36:26 +08:00
shortcutme
ad1bd045f7
Rev4011 2019-03-18 03:38:11 +01:00
shortcutme
c88152cac2
Use shared cursor where possible 2019-03-18 03:36:44 +01:00
shortcutme
61c72ac3ea
Fix SQLite concurrency errors 2019-03-18 03:36:12 +01:00
shortcutme
84c39f3baa
Less sensitive db progress handler 2019-03-18 03:33:51 +01:00
shortcutme
7d6ef195fd
Don't allow to run db on different thread 2019-03-18 03:33:28 +01:00
shortcutme
52ac972332
Keep need commit status if commit failed 2019-03-18 03:33:06 +01:00
shortcutme
9aa599f9d2
Close and commit all db at exit 2019-03-18 03:32:42 +01:00
shortcutme
a5ce7e5a1f
Rev4006 2019-03-18 01:08:35 +01:00
shortcutme
cfdc6bac7b
Remove test lock files after test 2019-03-18 01:08:02 +01:00
shortcutme
33e4c088b9
Upnp opening function return success value 2019-03-18 01:07:46 +01:00
shortcutme
a620bf2174
Fix lang html variable on config page 2019-03-18 01:06:45 +01:00
shortcutme
82c55ba038
Rev4003, Fix peer sorting if no ping delay yet 2019-03-16 04:57:59 +01:00
shortcutme
9f99fa8edc
Remove not working tracker 2019-03-16 04:26:59 +01:00
shortcutme
6e5bf5fef6
Decode masgpack hash key values as byte 2019-03-16 04:22:49 +01:00
shortcutme
c7b4e28f82
Version 0.7.0, Rev4001 2019-03-16 03:53:37 +01:00
shortcutme
f3a4b9c709
Fix announce py3 compatibility 2019-03-16 03:43:11 +01:00
shortcutme
ea638dd0e0
Fix Noparallel test on slower machines 2019-03-16 03:02:59 +01:00
shortcutme
f0b53c4cbb
Add bundled pybitcointools 2019-03-16 03:01:50 +01:00
shortcutme
3eae349a0a
Remove included win_inet_pton, websocket, rsa, socks, pyelliptic, pybitcointools, pyasn1, opensslVerify, merkletools, geventwebsocket, BitcoinECC, bencode module 2019-03-16 02:58:49 +01:00
shortcutme
567855e2d2
TestHelper formatting 2019-03-16 02:49:41 +01:00
shortcutme
955164aa3c
New configuration option to use libsecp256k1 for speedup 2019-03-16 02:45:06 +01:00
shortcutme
db8f9988eb
Use log extension for rolled log file names 2019-03-16 02:44:22 +01:00
shortcutme
9b2cae8e33
Don't log geventwebsocket module debug messages 2019-03-16 02:43:45 +01:00
shortcutme
ac325c5c5e
Py3 compatibility of FileRequest module 2019-03-16 02:43:07 +01:00
shortcutme
e92f3ea100
New watchdog module based file change watching 2019-03-16 02:42:43 +01:00
shortcutme
75d8338f2d
Debug stack formatting include module names 2019-03-16 02:41:09 +01:00
shortcutme
a1b5dad1c8
New Db connection type to avoid corruption 2019-03-16 02:40:32 +01:00
shortcutme
0e2f7fb122
Use global rsa module 2019-03-16 02:39:11 +01:00
shortcutme
ee631730c7
Remove sha1 sum function 2019-03-16 02:38:47 +01:00
shortcutme
f7fd445c73
Test sha sum parameter type properly 2019-03-16 02:38:38 +01:00
shortcutme
5c0fc38272
Remove not used ECC cert generation 2019-03-16 02:37:48 +01:00
shortcutme
6df0321962
Py3 compatibilty of CryptConnection module 2019-03-16 02:37:38 +01:00
shortcutme
65d19d350c
We don't support old style sign verification anymore 2019-03-16 02:36:45 +01:00
shortcutme
bc93796727
Add faster libsecp256k1 support for sign verification, Remove old style signing support, 2019-03-16 02:36:11 +01:00
shortcutme
af49404320
Remove support of old request type 2019-03-16 02:32:10 +01:00
shortcutme
717802860d
Create new unpacker object if client sending new-style, bin-type compatible msgpack streams 2019-03-16 02:31:49 +01:00
shortcutme
edd3f35790
Use new Msgpack library for unpacking 2019-03-16 02:30:54 +01:00
shortcutme
4fe4d0a7e7
BEGIN / END no longer necessary as there is no autocommit in new db module 2019-03-16 02:18:53 +01:00
shortcutme
8ab9b06185
Subtl module py3 compatibility 2019-03-16 02:06:28 +01:00
shortcutme
91c5556f21
Remove old gevent compatibility patches 2019-03-16 02:05:27 +01:00
shortcutme
95cf47d9a4
Test site download with all avaliable crypto lib 2019-03-16 01:01:30 +01:00
shortcutme
dfad2370aa
Test file locking 2019-03-16 01:01:06 +01:00
shortcutme
331e25cc41
Test content rules with all avaliable crypto lib 2019-03-16 01:00:49 +01:00
shortcutme
6dcf7e8088
Remove testing of old signature 2019-03-16 01:00:21 +01:00
shortcutme
99690a6145
Test longer string signing 2019-03-16 00:59:27 +01:00
shortcutme
27bcc3c685
Test sign and verify with all crypto lib avaliable 2019-03-16 00:59:11 +01:00
shortcutme
bb60558968
Test hashing functions 2019-03-16 00:57:50 +01:00
shortcutme
af38a3927a
Test utf8 diffing 2019-03-16 00:57:03 +01:00
shortcutme
bf6771152e
Test backward compatibility to py2 byte-less msgpack unpacker 2019-03-16 00:56:50 +01:00
shortcutme
48b6c81b36
Test msgpack streaming with binary data 2019-03-16 00:56:25 +01:00
shortcutme
d95da7372a
Feed Msgpack unpacker as byte 2019-03-16 00:54:27 +01:00
shortcutme
231037b0fe
Test Msgpack result 2019-03-16 00:54:12 +01:00
shortcutme
c481d20ce8
Use new libs in Msgpack tests 2019-03-16 00:54:00 +01:00