10230 Commits

Author SHA1 Message Date
Franco Fichtner
5f4c46eeff src: whitespace sweep 2019-01-23 13:06:50 +01:00
Ad Schellevis
49244f4771 we still need to pull https://github.com/dragonofmercy/Tokenize2/pull/51 to prevent escaping issues, closes https://github.com/opnsense/core/issues/3145 2019-01-23 11:54:35 +01:00
Ad Schellevis
aec3515cee Tokenize2, pull in 1.3 from https://github.com/dragonofmercy/Tokenize2 2019-01-23 11:44:34 +01:00
Franco Fichtner
e5296f7bb3 Revert "routing: add a separate static menu"
This reverts commit 98bef78b91c7c8a9c348f5a389170ce9dc9b19eb.
2019-01-23 08:02:27 +01:00
Franco Fichtner
5bb48c3eb2 monit: revert JS vars cleanup; closes #3142 2019-01-21 21:51:03 +01:00
Franco Fichtner
c536751114 rc: squelch stray "OK" in boot sequence for now 2019-01-21 09:29:30 +01:00
Franco Fichtner
8956716532 firmware: point to 19.1, not yet there but it will be 2019-01-21 07:59:01 +01:00
Franco Fichtner
c6c3252dd3 rc: permanent location for patches 2019-01-20 14:58:52 +01:00
Franco Fichtner
98bef78b91 routing: add a separate static menu
PR: https://github.com/opnsense/core/pull/2878
2019-01-20 11:55:07 +01:00
Franco Fichtner
4adc8ed618 firmware: connection is ok, repository is not
Just change the returned information into something that
makes sense here.  No functional changes between both
sides except we check repository for != 'ok' so we catch
all types of errors if they are added in the future.  Same
is already true for connection.
2019-01-18 19:58:30 +01:00
Ad Schellevis
c28b7915ee IDS, migration to 1.0.2, fix Trying to get property of non-object in.... 2019-01-18 17:36:03 +01:00
Franco Fichtner
9f935b533f console: this is not entirely correct 2019-01-18 17:29:39 +01:00
Ad Schellevis
a2899594a0 Monit, regression in refactor 2019-01-18 11:26:06 +01:00
Franco Fichtner
efbe2d5e98 firmware: correct invisible error in health check 2019-01-18 09:38:07 +01:00
Franco Fichtner
23c7c6f249 monit: style sweep 2019-01-17 20:06:14 +01:00
Franco Fichtner
c32cb08f58 monit: correct copyright headers, update LICENSE 2019-01-17 18:01:46 +01:00
Ad Schellevis
a111b345ff MVC, treat an empty ArrayField as non existent, closes https://github.com/opnsense/core/issues/3123 2019-01-17 17:10:24 +01:00
Ad Schellevis
6d11ffc2ab Monit, notifications are depricated in 19.1, remove the import here. 2019-01-17 15:37:14 +01:00
Ad Schellevis
8c547092f3 Merge branch 'fbrendel-monit' 2019-01-17 15:21:38 +01:00
Ad Schellevis
df8d12c8a0 Monit, major cleanup, related to https://github.com/opnsense/core/pull/3119
- remove locking in model, core framework should do that if required. (see Config->lock), deadlock issues in previous code (freezing UI)
- in settings controller, expand endpoints to one per type (in stead of "one to rule them all")
- in settings controller, align to base wrappers of ApiMutableModelControllerBase
- move extended validations to model, to avoid validation issues when another service would like to reuse the model
- align forms to standard wrappers (naming convention, simplifies code)
- remove "deleteRelations", if we need something like this at some point, it should be in the model, for now it seems safe enough to ditch
- ditch migration code, since it does the same as having a default value (defaults are always enforced during migrations)
** left UnitTest code for what it is now, probably needs changes too
2019-01-17 15:06:55 +01:00
Franco Fichtner
e4b194e884 firmware: also detect a revoked fingerprint 2019-01-17 15:00:00 +01:00
Ad Schellevis
70c2e0e45e Merge branch 'monit' of https://github.com/fbrendel/core into fbrendel-monit 2019-01-16 16:20:10 +01:00
Michael Steenbeek
e3de6b2e28 Fix usage of include_once in load_phalcon.php (#3109)
include_once returns TRUE if the file has already been loaded. This is not what you want if you're setting a variable from it.
http://php.net/manual/en/function.include-once.php

This fixes notices when including certain old scripts from modern controllers, as well as a notice when running run_migrations.php.
2019-01-16 13:01:46 +00:00
Ad Schellevis
f201d02b6c missed a spot in previous 2019-01-16 13:36:23 +01:00
Ad Schellevis
ac99876358 IPsec, add interface when phase1 is enabled, simplify logic. (from irc) 2019-01-16 13:21:54 +01:00
Ad Schellevis
53a5ea0ca7 Firewall/Alias, geoip, switch download to https 2019-01-16 11:13:23 +01:00
Ad Schellevis
e6170c16a0 Merge branch 'awerner-monit_deps' 2019-01-16 10:32:16 +01:00
Ad Schellevis
8ad3b9d1a2 Monit, clarify help message a bit. for https://github.com/opnsense/core/pull/3001 2019-01-16 10:30:51 +01:00
Ad Schellevis
dbb22bb691 Merge branch 'monit_deps' of https://github.com/awerner/core into awerner-monit_deps 2019-01-16 10:06:22 +01:00
Alexander Shursha
f3dad94b38 Add support IDN in aliases. (#3107) 2019-01-16 08:53:55 +00:00
Franco Fichtner
5a1b1d50f0 system: move "reboot" cron hook to better location
Firmware has both reboot and poweroff (halt) for early API access reasons,
but since they are not in the best place start by migrating the cron hook.

I am not sure when we should remove the firmware hooks, maybe in 19.7...
2019-01-15 09:33:23 +01:00
Michael Steenbeek
5689dc8048 Port reboot and shutdown pages to MVC (#3133) 2019-01-15 09:25:52 +01:00
Franco Fichtner
fb3fd528ad firmware: show untrusted error instead of "no updates" 2019-01-14 11:55:39 +01:00
Franco Fichtner
d8579502b7 system: remove some fluff from OpenSSL config 2019-01-14 09:49:03 +00:00
Michael Steenbeek
ea8dce33ba Add option to create combined client and server certificate, closes #2800 (#3130) 2019-01-14 10:16:09 +01:00
Franco Fichtner
23f440ceee src: style sweep, someone is feeling picky today 2019-01-14 08:46:46 +01:00
Franco Fichtner
530c5220dc src: header style updates, license additions, sync LICENSE 2019-01-14 08:34:57 +01:00
Franco Fichtner
86c7f6242c src: fix lint-exec pass 2019-01-14 08:14:06 +01:00
Franco Fichtner
f6a0443aa4 make: finish lint-exec excluding all arbitrary data 2019-01-14 08:11:52 +01:00
Mohammed Sadiq
ddeef3ea81 conf: Fix typo in message 2019-01-14 07:09:28 +01:00
Johannes Kastl
9f290d11f6 fix typo 'muti-WAN interface' (#3127) 2019-01-13 12:54:33 +00:00
Franco Fichtner
1c8731dd78 openvpn: flip back to multiple
It looked like the original request was misunderstood and this
changed the wrong option.

PR: https://forum.opnsense.org/index.php?topic=10950.0
2019-01-12 18:44:07 +01:00
Franco Fichtner
46527303cb firmware: add message for update 2019-01-12 14:22:20 +01:00
Franco Fichtner
f6aaaa0b95 system: small change in syslog-ng template 2019-01-12 12:28:04 +01:00
Franco Fichtner
33279d1d24 firmware: fix spurious comma in mirror label 2019-01-12 11:52:13 +01:00
Franco Fichtner
9b1e7bb1a4 web proxy: changes for previous
* Stop mentioning how tokenizer fields work.  Web proxy is the only
  part where this is done excessively and best explained in docs.
* Remove "->" as it could lead to invalid characters in HTML and
  translation misakes later on.
2019-01-11 17:04:09 +01:00
Northguy
0bdffc8856 Updated the help section for "Forwarded_for" (#3030)
* Updated the help section for "Forwarded_for"

Updated the help section for "Forwarded_for", based on original Squid documentation at http://www.squid-cache.org/Doc/config/forwarded_for/

Other option could be to use lesser verbosity and use the squid documentation hyperlink in the help text, but this might make the help section sensitive for URL changes outside the OPNsense project itself.

* started removing <br> and markup language. 

To be continued

* Removed allmost all formatting

Points for discussion is how to handle the URLs that refer to the templates that create Port forwarding and firewall rules for HTTP and HTTPs redirection

* Removed CDATA
2019-01-11 16:52:10 +01:00
Michael Steenbeek
392a9daee3 Fix implicit global declarations 2019-01-11 16:44:23 +01:00
Michael Steenbeek
97645093c3 Fix missing semicolons 2019-01-11 16:44:23 +01:00
Frank Brendel
cfca930466 monit: fix dropdown list for mixed test types 2019-01-11 12:49:05 +01:00