Add PAC support to proxy #2018

fabianfrz · 2017-12-25T22:58:54Z

Add PAC file support to the UI to allow Proxy autoconfiguration of some clients that support that standard

…matches anymore, negate is now a !

fichtner · 2017-12-26T10:05:57Z

src/opnsense/mvc/app/controllers/OPNsense/Proxy/forms/dialogEditBlacklist.xml

@@ -32,7 +32,6 @@
    <field>
        <id>blacklist.filter</id>
        <label>categories (if available)</label>
-        <type>text</type>


maybe we should break this out and merge it immediately?

It is not important at the moment - it is overwritten in the next line but it should be removed in the future as it might cause problems in the future (if for some reasons the other element is used).

merge glitch

fabianfrz · 2017-12-26T10:13:44Z

@fichtner the only thing still missing is a template reload button on all three tabs.

…ay to PAC tabs

fabianfrz · 2017-12-26T13:59:24Z

src/opnsense/mvc/app/views/OPNsense/Proxy/index.volt

@@ -466,7 +466,6 @@
                            <td></td>
                            <td>
                                <button data-action="add" type="button" class="btn btn-xs btn-default"><span class="fa fa-plus"></span></button>
-                                <button data-action="deleteSelected" type="button" class="btn btn-xs btn-default"><span class="fa fa-trash-o"></span></button>


@fichtner this button did nothing so I removed it

Ok if @AdSchellevis doesn’t want to keep it

@fabianfrz @fichtner it can go, I guess someone copied it in there a long time ago....

@AdSchellevis It did probably come from IDS because it is the only view with a list containing checkable checkboxes.

fabianfrz · 2017-12-26T14:02:55Z

@fichtner the model needs some improvements regarding to validation but the rest seems good now.

fichtner · 2017-12-26T16:08:07Z

src/opnsense/mvc/app/views/OPNsense/Proxy/index.volt

@@ -230,7 +447,7 @@
            <tr>
                <td colspan="2">
                    <div id="remoteACLchangeMessage" class="alert alert-info" style="display: none" role="alert">
-                        {{ lang._('Note: after changing categories, please remember to download the ACL again to apply your new settings') }}
+                        {{ lang._('Note: After changing categories, please remember to download the ACL again to apply your new settings') }}


Better to ditch „Note: „ prefix if this is changed.

fichtner · 2017-12-26T16:10:44Z

src/opnsense/service/templates/OPNsense/Proxy/+TARGETS

@@ -8,3 +8,4 @@ post-auth.conf:/usr/local/etc/squid/post-auth/dummy.conf
 pre-auth.conf:/usr/local/etc/squid/pre-auth/dummy.conf
 rc.conf.d:/etc/rc.conf.d/squid/squid
 squid.conf:/usr/local/etc/squid/squid.conf
+wpad.dat:/usr/local/www/wpad.dat


It’s a bit strange to drop files into www but I know what you are after

Do you have a better idea? The URL does not really match the pattern of standard OPNsense rules. Otherwise we would have to heavily rewrite routes in lighttpd.

No, I’m only raising awareness. In any case this will not merge before stable/18.1 is branched so we have time to think about this. For now this is good enough for -devel

the only thing I could think of is adding a custom rewrite to a controller without authentication.

fabianfrz · 2017-12-26T17:35:36Z

@fichtner it's time for a test run ;)

fabianfrz · 2017-12-28T16:35:44Z

@fichtner the generated JS is valid and it looks good. It may be published in devel.

fichtner · 2017-12-28T16:36:59Z

Not yet, or else this lands in 18.1-RC1...

fabianfrz · 2017-12-31T22:39:33Z

fixed conflict

fabianfrz · 2018-01-05T20:46:02Z

@fichtner I found a small GUI issue - maybe you have an idea: Some fields will be hidden when the modal shows up: https://github.com/opnsense/core/pull/2018/files#diff-23d36dcc2f04f176686a881d17c288bdR190

so the event will be emitted here for example where the data should already be mapped: https://github.com/opnsense/core/blob/master/src/opnsense/www/js/opnsense_bootgrid_plugin.js#L217
However it seems $.val() may return a wrong value as the form may show an incorrect dependent field (Some kind of a race condition?)

fabianfrz · 2018-01-28T16:31:54Z

@fichtner the issue was fixed a week ago

fabianfrz · 2018-03-31T07:10:05Z

ping

Additional PRs:

fichtner · 2018-03-31T07:15:05Z

Let me finish 18.1.6 for new images, then we pull this in. Is everything ready from your end?

fichtner · 2018-03-31T07:15:37Z

(Your PR summary says otherwise)

fabianfrz · 2018-03-31T08:06:00Z

@fichtner It was for a long time as I can remember. This pull request only adds a template to Squid to allow to create a PAC file as OPNSENSE-INTERFACE-HOST/wpad.dat which can be used to automatically configure the proxy in Firefox, Windows, Atom and so on. The Other Pull requests are more simple - they only add the WPAD DNS-Records and DHCP Options. I will give this branch a try again.

fabianfrz · 2018-03-31T08:26:24Z

found a bug and fixed it but the rest looks good.

fabianfrz · 2018-04-04T07:53:36Z

fixed conflict of "+Targets" via GitHub online editor.

fichtner · 2018-06-12T16:34:51Z

@fabianfrz will you rebase / fix conflict? thanks

fabianfrz · 2018-06-12T16:47:58Z

I hope the github merge did what it was intended to do.

fichtner · 2018-07-06T19:39:31Z

Merged, thanks!

fabianfrz and others added 5 commits December 24, 2017 22:43

proxy: add GUI for PAC support

6718ae3

proxy: add controller controller code

e88d41f

proxy: bugfixes in PAC as well as GUI will not show the full form in …

d315fb6

…matches anymore, negate is now a !

proxy: add pac template; model adjustments

276a8d0

Merge branch 'master' into pac

a459cb1

fichtner self-assigned this Dec 26, 2017

proxy: add network match support in wpad.dat

3d23774

fichtner reviewed Dec 26, 2017

View reviewed changes

fichtner added the feature Adding new functionality label Dec 26, 2017

fabianfrz and others added 4 commits December 26, 2017 12:07

proxy: fix form; add proxy type to view (to make clear which type it is)

40cb2c8

proxy: add template reload button without interrupting squid in any w…

b68aad7

…ay to PAC tabs

Merge branch 'master' into pac

b3ac1fc

proxy: remove useless button, fix typo

7d6365c

fabianfrz commented Dec 26, 2017

View reviewed changes

fabianfrz mentioned this pull request Dec 26, 2017

WPAD support #2023

Closed

fichtner reviewed Dec 26, 2017

View reviewed changes

fabianfrz added 2 commits December 26, 2017 18:25

proxy add extra validation for PAC matches

13bb62a

proxy: add some extra validations

c91d35b

fabianfrz changed the title ~~WIP: Add PAC support to proxy~~ Add PAC support to proxy Dec 26, 2017

fabianfrz added 3 commits December 27, 2017 13:16

remove note from string

d6a94e2

proxy: type issue: timeRange used integers

1eee818

proxy: some better defaults and upcase in PAC rule

c7eed67

Merge branch 'master' into pac

8729f59

fabianfrz mentioned this pull request Jan 4, 2018

Trust MVC from Smart-Soft #2053

Closed

fabianfrz added 2 commits January 22, 2018 19:40

fix: actions after mapping data to form can now be triggered using on

544f745

pac: fix HTML copliance (nested anchors)

23d99bf

fabianfrz added 2 commits February 6, 2018 18:14

tmp

0692737

pac: update to latest core changes

6e17682

fix: don't render disabled entries

edda85f

Merge branch 'master' into pac

c1884b0

Merge branch 'master' into pac

243bcfd

fichtner approved these changes Jul 6, 2018

View reviewed changes

fichtner merged commit 7386a5f into opnsense:master Jul 6, 2018

fabianfrz deleted the pac branch July 9, 2018 18:42

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add PAC support to proxy #2018

Add PAC support to proxy #2018

fabianfrz commented Dec 25, 2017 •

edited

Loading

fichtner Dec 26, 2017

fabianfrz Dec 26, 2017

fichtner Jun 12, 2018

fabianfrz commented Dec 26, 2017

fabianfrz Dec 26, 2017

fichtner Dec 26, 2017

AdSchellevis Dec 26, 2017

fabianfrz Dec 26, 2017

fabianfrz commented Dec 26, 2017

fichtner Dec 26, 2017

fichtner Dec 26, 2017

fabianfrz Dec 26, 2017

fichtner Dec 26, 2017

fabianfrz Dec 26, 2017

fabianfrz commented Dec 26, 2017

fabianfrz commented Dec 28, 2017

fichtner commented Dec 28, 2017

fabianfrz commented Dec 31, 2017

fabianfrz commented Jan 5, 2018

fabianfrz commented Jan 28, 2018

fabianfrz commented Mar 31, 2018

fichtner commented Mar 31, 2018

fichtner commented Mar 31, 2018

fabianfrz commented Mar 31, 2018

fabianfrz commented Mar 31, 2018 •

edited

Loading

fabianfrz commented Apr 4, 2018

fichtner commented Jun 12, 2018

fabianfrz commented Jun 12, 2018

fichtner commented Jul 6, 2018

Add PAC support to proxy #2018

Add PAC support to proxy #2018

Conversation

fabianfrz commented Dec 25, 2017 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

fabianfrz commented Dec 26, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

fabianfrz commented Dec 26, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

fabianfrz commented Dec 26, 2017

fabianfrz commented Dec 28, 2017

fichtner commented Dec 28, 2017

fabianfrz commented Dec 31, 2017

fabianfrz commented Jan 5, 2018

fabianfrz commented Jan 28, 2018

fabianfrz commented Mar 31, 2018

fichtner commented Mar 31, 2018

fichtner commented Mar 31, 2018

fabianfrz commented Mar 31, 2018

fabianfrz commented Mar 31, 2018 • edited Loading

fabianfrz commented Apr 4, 2018

fichtner commented Jun 12, 2018

fabianfrz commented Jun 12, 2018

fichtner commented Jul 6, 2018

fabianfrz commented Dec 25, 2017 •

edited

Loading

fabianfrz commented Mar 31, 2018 •

edited

Loading