Commit Graph

11713 Commits

Author SHA1 Message Date
Kay Marquardt
771e303e37 filter_chain does now work without direct
BUT only if no external firewall configuration is detected, i.e. fail2ban.
In this case a Warning is diplayed to activate direct.
2017-05-10 12:05:44 +02:00
Kay Marquardt
18e165e925 filter_chain works now also without direct
filter_chain works now also without direct but its recommended.
a waning is displayed if you use it with fail2ban detected and without direct mode
2017-05-10 12:02:37 +02:00
Kay Marquardt
09c125ad9a prevent modifiying of filtered chains 2017-05-10 11:54:46 +02:00
Kay Marquardt
7127ac2072 add warning aubout using filter_chain without direct 2017-05-10 11:51:10 +02:00
Kay Marquardt
b9507b0d77 adjust description direct must be active 2017-05-10 10:37:41 +02:00
Kay Marquardt
fe265aa65b add description to mention direct must be active 2017-05-10 10:36:58 +02:00
Kay Marquardt
f003b029b6 hotfix for filter_chain: use only with direct 2017-05-10 10:07:05 +02:00
Jamie Cameron
41c5bd30ea Merge pull request #551 from gnadelwartz/master
filter out chains not managed by firewall and add warning if fail2ban detected
2017-05-09 10:30:53 -07:00
Jamie Cameron
f5549dbe39 Merge branch 'master' of git@github.com:webmin/webmin 2017-05-09 09:17:51 -07:00
Kay Marquardt
0b416e09e8 Merge pull request #1 from gnadelwartz/firewall-f2b-warn
merge branch wadd arning about fail2ban firewalll rules detected
2017-05-09 13:24:55 +02:00
Kay Marquardt
e01770a0a1 adjust translation 2017-05-09 13:23:48 +02:00
Kay Marquardt
bcec484ebf adjust description 2017-05-09 13:22:08 +02:00
Kay Marquardt
314489fae7 more secure matching against chains to filter out 2017-05-09 13:13:43 +02:00
Kay Marquardt
87854875b7 remove default for filter_chain 2017-05-09 13:09:06 +02:00
Kay Marquardt
da0b587b2b add index_fail2ban 2017-05-09 12:31:46 +02:00
Kay Marquardt
3290f4c11f index_fail2ban translation 2017-05-09 12:29:57 +02:00
Kay Marquardt
7a3782a680 detect fail2ban usage 2017-05-09 12:26:33 +02:00
Jamie Cameron
e1d7fc3c14 Don't check fields that don't exist https://github.com/webmin/webmin/issues/553 2017-05-08 19:16:00 -07:00
Kay Marquardt
b5d1826ef7 Update config 2017-05-07 21:14:43 +02:00
Kay Marquardt
41908574ee Update config.info.de 2017-05-07 21:01:14 +02:00
Kay Marquardt
46f5f9715f Update config.info 2017-05-07 20:59:43 +02:00
Kay Marquardt
e9a5ea229c firewall-lib.pl regex to filter out chains
add regex filter to filter out chains not managed by firewall, i.e. fail2ban,
in get_iptables_save()
2017-05-07 20:58:31 +02:00
Jamie Cameron
f8a2f9595d Merge pull request #549 from ymulleneers/master
Indentation
2017-05-06 19:19:16 -07:00
Jamie Cameron
867fda60dc Also import the theme key 1.840 2017-05-06 12:07:34 -07:00
Jamie Cameron
04c217c97a Prevent same allowed path being listed twice 2017-05-06 11:41:08 -07:00
Jamie Cameron
e787caf228 Fix path validation when saving files https://github.com/webmin/webmin/issues/548 2017-05-06 11:24:31 -07:00
Jamie Cameron
45d5dec5a3 Fix perl warning 2017-05-05 16:14:24 -07:00
Jamie Cameron
1efb2eb206 Support Virtuozzo linux https://sourceforge.net/p/webadmin/bugs/4877/ 2017-05-05 14:30:12 -07:00
Jamie Cameron
4aceed5c8d Add perl-Encode-Detect dependency 2017-05-05 14:15:57 -07:00
MUY
f046efed20 Merge pull request #1 from ymulleneers/ymulleneers-patch-1
Update sorttable.js
2017-05-05 20:33:52 +02:00
MUY
d7a9fdb431 Update sorttable.js
Indentation
2017-05-05 20:33:19 +02:00
Jamie Cameron
814cf262fe Merge pull request #547 from qooob/patch-16
Check for valid encoding
2017-05-05 10:07:39 -07:00
Jamie Cameron
0ce247a1aa Merge pull request #546 from qooob/patch-15
Let non-unicode users read files in their charset correctly + check f…
2017-05-05 10:07:10 -07:00
Jamie Cameron
82a0a3e5c0 Remove non-ascii chars that aren't allowed in SSL certs https://www.virtualmin.com/node/52077 2017-05-05 09:56:14 -07:00
Jamie Cameron
245709dca0 Only iterate over the last octet network 2017-05-04 23:36:23 -07:00
Ilia Rostovtsev
944b6d728c Check for valid encoding
There are cases when detected `$encoding_name` is not recognized by `decode()` subroutine leading to fatal error.
2017-05-04 15:39:09 +03:00
Ilia Rostovtsev
59b59b2e43 Let non-unicode users read files in their charset correctly + check for valid encoding
In case a user still have old, non-UTF8 setup, they still need to see files in their encoding correctly, thus without converting output to utf-8. The way it is now, breaks things.

Also, there are cases when detected `$encoding_name` is not recognized by `decode()` subroutine.
2017-05-04 15:36:42 +03:00
Jamie Cameron
77c84a7539 Handle case where encoding module is missing 2017-05-03 20:43:38 -07:00
Jamie Cameron
9716326acd Merge pull request #543 from qooob/patch-13
Make editor respect file's initial encoding: Viewer
2017-05-03 20:41:25 -07:00
Jamie Cameron
89331739f3 Merge pull request #545 from amishxda/master
add noportcheck to not to check if port is in use
2017-05-03 19:03:32 -07:00
Amish
2b0e28852e add noportcheck to not to check if port is in use
add variable noportcheck to not to check if port is in use
2017-05-03 14:22:10 +05:30
Jamie Cameron
12ef84ff3e Merge pull request #544 from qooob/patch-14
Make editor respect file's initial encoding: Saver
2017-05-02 21:58:39 -07:00
Ilia Rostovtsev
85e80edf91 Make editor respect file's initial encoding: Saver
An addition to `edit_file.cgi` commit.
2017-05-02 13:26:30 +03:00
Ilia Rostovtsev
8e44c145b9 Make editor respect file's initial encoding: Viewer
This patch will make sure that user, will be able to READ files with different encodings properly and also, will be able to SAVE them without changing the initial encoding.

This awesomeness requires dependencies. However, RHEL has it installed by default but not Debian. New Webmin release should make sure to require/pull dependent packages:

For RHEL: `perl-Encode-Detect`
For Debian: `libencode-detect-perl`

P.S. We should no let user to set non-UTF8 locale anymore. All languages should be displayed unambiguously, like Google does, (Русский, svenska, Deutsche, English (United States) .. ).
2017-05-02 13:23:34 +03:00
Jamie Cameron
a1f53a5a47 Merge pull request #541 from qooob/patch-12
For the future so user could choose encoding in file editor window
2017-05-01 22:27:37 -07:00
Ilia Rostovtsev
b91a867744 For the future so user could choose encoding in file editor window
I think I did it correctly, theoretically looks good. I just don't know if `$in{'encoding'}` has to be escaped anyhow. Other than that, it seems ok, as when user passes encoding, it will tell the script to use one.
2017-05-01 20:49:17 +03:00
Jamie Cameron
dd5fa1295b Merge pull request #540 from qooob/patch-11
Typo, missing ;
2017-05-01 10:24:27 -07:00
Ilia Rostovtsev
6bb5b79d80 Typo, missing ; 2017-05-01 20:12:29 +03:00
Jamie Cameron
1494007307 Merge pull request #539 from qooob/patch-10
Fix for folks not using UTF-8 #52019
2017-05-01 10:09:01 -07:00
Ilia Rostovtsev
edd32a0819 Here is the fix for folks not using UTF-8 #52019
This is more like server side thing.

We expect that everything that is coming from the editor (CodeMirror) is always UTF-8 encoded. In case, global encoding is set to something different, then UTF-8, we must use the user encoding to properly encode the data and have correct file encoding after all.

[#52019](https://www.virtualmin.com/node/52019)
2017-05-01 20:04:27 +03:00