995 Commits

Author SHA1 Message Date
Athanasius
e23d5d3b29 Merge branch 'develop' 2022-01-21 09:46:05 +00:00
Athanasius
a8f657c2d6 schemas/README: bottle body size limit *is* affected by compression
I explicitly tested this with a 50KiB limit on beta EDDN service:

1. 49973 byte message does make it through, in plain text.
2. 51312 byte message, no compression, 413.
3. Same message, with gzip compression, 200
4. The 149242 byte file I based those extra ones on also makes it
  through when compressed.

Indeed the Gateway logging cites the compressed-body size.  `bottle`
isn't looking at the message and magically decompressing it in order to
check plain-text size.
2022-01-21 09:43:55 +00:00
Athanasius
440d2b1c9f Merge branch 'live' into beta 2022-01-21 09:21:41 +00:00
Athanasius
853c309df0 schemas/README: Give examples of LoadGame for Horizons/Odyssey flags 2022-01-20 11:40:41 +00:00
Athanasius
7819eff826 schemas/README: Give some hints about odyssey/horizons flags 2022-01-20 11:32:08 +00:00
Athanasius
e6a9dd51b5 Merge branch 'master' into live Release/d.20220118-00 2022-01-18 15:58:31 +00:00
Athanasius
fc2217b7a4 Merge branch 'master' into beta 2022-01-18 15:57:20 +00:00
Athanasius
756e2bc06d Merge branch 'develop' 2022-01-18 15:57:05 +00:00
Athanasius
8d5b03915b Gateway: Log where upload data is form-encoded
We suspect no-one is actually using this possible form of upload, and
ideally would remove the code for it entirely.  First we need to log any
uploaders that do use this form to be sure.
2022-01-18 15:53:06 +00:00
Athanasius
4ae424f887
Merge pull request #169 from EDCD/enhancement/CL-arg-loglevel
Support `--loglevel <level>` CL arg in all entry point scripts
2022-01-18 15:38:24 +00:00
Athanasius
8f7910a5d9 Bouncer: Support --loglevel <level> CL arg
This also aligns the general logger setup with the other scripts
2022-01-18 15:22:02 +00:00
Athanasius
6986af7ca0 Settings.py: Remove import argparse
CL arg parsing is done in main scripts now.
2022-01-18 15:17:45 +00:00
Athanasius
fe214583aa Relay: Support --loglevel <level> fully
There's no real logging in Relay yet, but this makes it support
switching level anyway.
2022-01-18 15:16:32 +00:00
Athanasius
86b283f920 Monitor.py: Minimal changes to allow --loglevel <level>
The CL arg won't actually *do* anything yet, because this script doesn't
actually have a logger set up at all.  But we need to fake this else
eddn.conf.Settings.loadConfig() won't be called correctly or work.
2022-01-18 15:09:56 +00:00
Athanasius
fb3c0348ad Gateway: Support --loglevel <level> CL arg
NB: This required changes to src/eddn/conf/Settings.py as well, which
means other scripts, e.g. Monitor.py, will also need changing.
2022-01-18 15:02:38 +00:00
Athanasius
872c65c280 setup.py: Do *not* install eddn-logs-archive script
This should be done manually, so as to be using the correct version from
the correct branch on the live service.
2022-01-18 14:16:45 +00:00
Athanasius
8793ff9151 Merge branch 'master' into live 2022-01-18 14:15:42 +00:00
Athanasius
555672d555 Merge branch 'develop' 2022-01-18 14:15:15 +00:00
Athanasius
79b78ac831 scripts/eddn-report: Quieten some EDMC errors
They're noted in <https://github.com/EDCD/EDMarketConnector/issues/1403>
2022-01-18 11:21:21 +00:00
Athanasius
3ffff54c4b contrib/eddn-logs-archive: Run gateway error report script on gateway.log
* Renamed some variables to be truer to their content and use.
* Run eddn-report-log-errors if rotating a gateway.log file.
2022-01-17 09:22:37 +00:00
Athanasius
a1e330be2c scripts/eddn-report: EVA is abandoned, so ignore 2022-01-17 09:18:40 +00:00
Athanasius
e351e070a0 Merge branch 'beta' of ../../dev/EDDN into beta 2022-01-16 12:23:50 +00:00
Athanasius
f19b530054 Merge branch 'develop' of ../../dev/EDDN into develop 2022-01-16 12:23:34 +00:00
Athanasius
17f98121a9 Merge branch 'master' into live 2022-01-16 12:21:42 +00:00
Athanasius
ea4e0b1d4d scripts/eddn-report: Current G19s version only / EVA is abandoned 2022-01-16 09:33:45 +00:00
Athanasius
e69f7a938a scripts/eddn-report: Add Moonlight/1.3.4/Scan case 2022-01-15 14:09:47 +00:00
Athanasius
40a1d11e76 contrib/eddn-logs-archive: Produce report on rotated logfile 2022-01-14 11:02:32 +00:00
Athanasius
cc5ae32227 scripts/eddn-report: Correct EliteLogAgent comment 2022-01-12 15:43:59 +00:00
Athanasius
e93c04bb21 scripts/eddn-report: EliteLogAgent latest is 2.0.0.660
This allows for ignoring the ancient 0.9.2.412 that showed some errors
yesterday.
2022-01-12 09:40:47 +00:00
Athanasius
00071ba7e9 scripts/testing: Remove per-scenario scripts
The required functionality is now all in `test-sender.py`.
2022-01-11 16:43:30 +00:00
Athanasius
ad8fc57df3 scripts/test-sender: Support --gzip=bad 2022-01-11 16:41:25 +00:00
Athanasius
7537a300c0 scripts/test-sender: Support for valid gzip compression 2022-01-11 16:31:05 +00:00
Athanasius
fb83aae240 scripts/test-sender: Support for requesting good or bad form encoding 2022-01-11 16:27:20 +00:00
Athanasius
ecd3afbbbc scripts/test-sender.py: Allow 'beta' and 'dev' --url aliases
Also explicitly states the URL and input file it uses.
2022-01-11 16:12:21 +00:00
Athanasius
02b2ea6e18 scripts/test-sender.py: Allow for changing target URL 2022-01-11 16:08:59 +00:00
Athanasius
d13fa75a51 Merge branch 'live' of github.com:EDCD/EDDN into live Release/d.20220111-01 2022-01-11 15:43:25 +00:00
Athanasius
1ee25a69d6 Merge branch 'master' of github.com:EDCD/EDDN 2022-01-11 15:42:22 +00:00
Athanasius
a4eb7548d9
Merge pull request #166 from EDCD/fix/165/bad-formencoded-detection
Gateway: Revert non-gzip form encoded check
2022-01-11 15:39:01 +00:00
Athanasius
6799a7fae9 scripts/testing: Target dev:4432, not beta:4431
In the long-term these all need to support a CL arg to select the
target.
2022-01-11 15:36:53 +00:00
Athanasius
a1d347aec5 scripts/testing: Add general "uses gzip" script 2022-01-11 15:35:24 +00:00
Athanasius
abcf472197 Gateway: Revert non-gzip form encoded check
Fixes the regression identified in #165

However the gzip code path can still erroneously think a decompressed
request body is form encoded when it is not.  This happens when any text
in the decompressed body matches the regex:

        .+=[^\&;]*

i.e. some text, followed by `=`, and then some more text, possibly
empty, followed by an ampersand `&`, or semi-colon `;`, or the end of the
string.

`&` and `;` are used to separate key=value pairs in form encoding, the
`=` separates a key from its value.
2022-01-11 15:06:02 +00:00
Athanasius
6add1d5c6b Merge branch 'master' of github.com:EDCD/EDDN 2022-01-11 15:01:20 +00:00
Athanasius
759b14c844 scripts/testing: Add "valid JSON looks like form-encoded" file
Ref: https://github.com/EDCD/EDDN/issues/165
2022-01-11 14:40:16 +00:00
Athanasius
7963b87d9e
Merge branch 'master' into live 2022-01-11 13:49:38 +00:00
Athanasius
2d60092d0e
README: Emphasise developers must comply with documentation 2022-01-11 13:47:41 +00:00
Athanasius
1caf5f0600
README: 'Documentation' section removed as un-necessary 2022-01-11 13:44:42 +00:00
Athanasius
fc4d5a2be6
Merge branch 'master' into live 2022-01-11 13:43:22 +00:00
Athanasius
01ce718ab8
Merge branch 'master' of github.com:EDSM-NET/EDDN 2022-01-11 13:42:48 +00:00
Athanasius
40262322ff
README: Expansion and tweaks for replacing the Wiki page
* A few uploading PC softwares are listed to lower the barrier for a new
  player finding such.  This is *never* going to be an exhaustive list.
* Added section listing console options for contributing data.  Again,
  not intended to be exhaustive.
* Layout/sections tweaked.  Hopefully the use of double horizontal rules
  emphasises which section text is a part of.
2022-01-11 13:40:42 +00:00
Athanasius
a39f24c55d
README: Add 'Contact' section at the bottom 2022-01-11 13:13:06 +00:00