Merge lp:~joergberroth/ubuntu-system-settings/wifi-802-1x-configurations into lp:ubuntu-system-settings

[JkB]

Added support for 802-1x wireless network configurations.

* missed an additional NUL-Termination for passing cert and key path. Prevented to successfully put them into nm-config using path-scheme.
Fine now.

Additionally:
As not all eap networks have cert files issued, one will be able to connect even without selecting one.
Maybe a security warning should be thrown in the dialog informing the user - if he sets certs option to None - that this is a lag in security (mitm attacks)

[Jonas G. Drange (jonas-drange)]

This is really great. Thanks for proposing this.

I've added some comments, but they're mostly about your decision to make the Dialog an ItemPage. If this is not crucial to the implementation of support for 802-1x, we need to revert it.

Also, if cert picking is not implemented, please remove all components that are unused. Please leave the UI bits in, but hide it with "visible: showAllUI". This way we can get strings translated.

Thanks again.

review: Needs Fixing

[JkB (joergberroth)]

> This is really great. Thanks for proposing this.
>
> I've added some comments, but they're mostly about your decision to make the
> Dialog an ItemPage. If this is not crucial to the implementation of support
> for 802-1x, we need to revert it.
>
> Also, if cert picking is not implemented, please remove all components that
> are unused. Please leave the UI bits in, but hide it with "visible:
> showAllUI". This way we can get strings translated.
>
> Thanks again.

Hey, thanks a lot for for reviewing.

First I had the concerns about pushing it to an ItemPage, too. Then, after dealing with the variety of different configurations, I found there would be an advantage if one changes to ItemPage. There is no need for the ItemPage from implementation point of view but there are configurations for which the user has to be asked up to two different certificates and an additional private key (TLS) and there can be different types of path2 authentication types for the different WPA Enterprise configurations.
So if we want the user to be able two choose all the different types of configurations, it seems to me that a dialog would get quite overloaded with ui inputs. And correct me if I'm wrong but scrolling, which certainly would be needed, seems not to be provided for the dialogs.
At the moment there are some pages in the cellular settings (e.g. APN) where one switched to ItemPages, too. So from design point of view it would keep consistent.

Maybe, based on these points, we can quickly discuss this again before I revert the change.

All other comments are clear. I will consider for the next commit.
I think the file picker would make selecting certificates even more comfortable but I will remove it as proposed, so one can work on that later.

Thanks again.

Joerg

[Matthew Paul Thomas (mpt)]

Thanks so much for working on this, Joerg!

Jonas is right, though, that the authentication UI does need to remain a dialog. The reason is that System Settings is just one of three -- and will eventually be just one of six -- different places that might launch the UI for entering Wi-Fi details. The first-run setup "Connect to Wi-Fi" screen, and the network indicator menu, should let you connect to all the same Wi-Fi networks that System Settings does, by putting up the same dialog. <https://wiki.ubuntu.com/Networking#wi-fi-authenticating>

When dialog contents are bigger than the available screen space, the body is supposed to scroll automatically, and apparently this has been implemented already (bug 1376763). If it's not working, please report a bug.

review: Needs Fixing (design)

[JkB (joergberroth)]

Thanks for the review and the hints.
It was not clear from documentation for me. But the bug post made it.
I just reverted the page back to dialog.

Am 2015-04-27 um 13:04 schrieb Matthew Paul Thomas:
> Review: Needs Fixing design
>
> Thanks so much for working on this, Joerg!
>
> Jonas is right, though, that the authentication UI does need to remain a dialog. The reason is that System Settings is just one of three -- and will eventually be just one of six -- different places that might launch the UI for entering Wi-Fi details. The first-run setup "Connect to Wi-Fi" screen, and the network indicator menu, should let you connect to all the same Wi-Fi networks that System Settings does, by putting up the same dialog. <https://wiki.ubuntu.com/Networking#wi-fi-authenticating>
>
> When dialog contents are bigger than the available screen space, the body is supposed to scroll automatically, and apparently this has been implemented already (bug 1376763). If it's not working, please report a bug.
>

[Matthew Paul Thomas (mpt)]

Thank you.

review: Abstain (design)

[Marcus Tomlinson (marcustomlinson)]

Your code isn't compiling. There are some weird "!==" occurrences in 2 of your .cpp files. Rather hard to test your changes work when the project doesn't compile no? :P

review: Needs Fixing

[Jonas G. Drange (jonas-drange)]

Getting [1] when trying to build. Could you fix those? Thanks.

[1] http://pastebin.ubuntu.com/10989993/

review: Needs Fixing

[Matthew Paul Thomas (mpt)]

Yesterday, before I saw this new merge proposal, I was tackling the same question: "Where to store the cert files?" Also private key files and PAC files. On Ubuntu for PC, the current answer is in their own app, "Passwords and Keys". But on phones/tablets the overall system UI real estate is much smaller, so as with software updates and system version, this task fits best in System Settings.

This means the same conclusion (3) that you came to: storing the files in System Settings. "For this reason, System Settings should be set up as the default handler for certificates, private key files, and PAC files that you download or open, showing a confirmation dialog with info about the certificate/file and “Cancel” and “Save” buttons, and then lowering itself behind the previous app." <https://wiki.ubuntu.com/Networking#wi-fi-authentication-variations> I haven't designed those three dialogs in detail because I haven't yet found a reference for what data those files contain.

A later task will be to design+implement a way to remove previously-saved certificates/files inside System Settings.

[Jonas G. Drange (jonas-drange)]

Thanks, Joerg. It builds and it looks good! I have a couple of questions and comments:

1. If file picker fails, I prefer that it was reverted to "None". What do you think?
2. Could you add some instructions on how to test this?
3. I don't quite understand the diff L98-200, why is the indentation changed?
4. L425, L465, L506, L559: Please use visible: showAllUI for things not yet implemented.
5. L431, L440, L482, L673, L675, L678, L869, L877, L885, L893, L901, L909: Extra space
6. L759: If it's not needed, please just remove it. If it's something we might have to do, maybe make it a TODO?

This would be difficult to test using autopilot, but we should try. I can help you, if you can inform me on what the most common WPA2 Enterprise network looks like, and what the user needs to do, using your UI, to connect to it.

Thanks again.

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1401
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2139/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3098
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/409
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2610
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3096
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3096/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20989

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2139/rebuild

review: Approve (continuous-integration)

[JkB (joergberroth)]

Jonas, thanks for reviewing.

First,
4.-6. To which diff/file do your line numbers refer to. I don't get them
aligned with my r1401 into r1435.

1. You are right. Also, if a cert is added, the added cert item should
be selected after closing the dialog. I will keep on working on that.

2. To fully test this, ideally, proper networks have to be available to
connect to. As they are not easy to set up or even seem to be hardware
dependent, one may think about if its possible to emulate the networks.
What I could test so far, besides the typical WPA and WEP, was a
TTLS/MSCHAP2 network. The TTLS is typically used for "eduroam",
available at most universities all over europe. They might differ in the
phase-2-authentication (inner authentication) type from university to
university.

If you just want to test the creation of the right configuration it
should be sufficient to check the configuration file for the network in
/userdata/system-data/etc/NetworkManager/system-connection/ and compare
them to example files. These files are created even if no network is
available. There was already an error handling integrated that prints
wpa_supplicant errors in the feedback dialog. So e.g. if your cert file
does not contain the content it should, it will be wpa_supplicant that
reports this.

I don't know what wifi infrastructures you have around, but I believe it
is hard to get everyone.
I've heard of wpa_supplicant being able to emulate different WPA
networks, but I had not have the time to look into that.

My connection test on a TTLS/MSCHAPv2 eduroam was established
successfully. Maybe it would be best to let people test it with there
networks.

Hence, for testing and maybe autopilot testing for an example connection
- lets take the TTLS/MSCHAPv2 - one has to go through the following steps:

1. type in network name (SSID)
2. select WPA Enterprise
3. select auth TTLS
4. select inner auth MSCHAPv2
5. CA certificate ( lets state that no one is installed) -> select choose...
6. use content hub to import a cert file (.pem supported at the moment)
7. content hub will import it to the Documents folder of
ubuntu-system-settings.
8. the file will be shown on the CertDialog and the user can decide to
save the file.
9. If that file is not empty, it will be moved to the wifi/ssl/certs/
folder. The data model will use the files in that folder to build the
itemselector.
10. Choose the right ca cert.
11. type in anonym identity, identity and Password.
12. then connect. If the network will not be found, an error message
will be thrown.

I do not know anything about autopilot testing so far. If you believe we
can get this running, I just could support you.

Thanks,
Joerg

Am 2015-06-05 um 14:11 schrieb Jonas G. Drange:
> Review: Needs Fixing
>
> Thanks, Joerg. It builds and it looks good! I have a couple of questions and comments:
>
> 1. If file picker fails, I prefer that it was reverted to "None". What do you think?
> 2. Could you add some instructions on how to test this?
> 3. I don't quite understand the diff L98-200, why is the indentation changed?
> 4. L425, L465, L506, L559: Please use visible: showAllUI for things not yet implemented.
> 5. L431, L440, L482, L673...

[Jonas G. Drange (jonas-drange)]

On 5 June 2015 at 20:57, JkB <email address hidden> wrote:

> Jonas, thanks for reviewing.
>
>
​Happy to!​

> First,
> 4.-6. To which diff/file do your line numbers refer to. I don't get them
> aligned with my r1401 into r1435.
>
>
​I meant the web diff [1]. I am not certain as to why I did not use the
inline comment system. Sorry!

[1]
https://code.launchpad.net/~joergberroth/ubuntu-system-settings/wifi-802-1x-configurations/+merge/261022/+preview-diff/629978/+files/preview.diff
​

> 1. You are right. Also, if a cert is added, the added cert item should
> be selected after closing the dialog. I will keep on working on that.
>
>
​Awesome.​

> 2. To fully test this,
> …
> "eduroam"
> ​ [is] ​
> available at most universities all over europe.

Me and my brother both have Ubuntu Phones and attend university, so we'll
give eduroam a go. Good idea!​

> If you just want to test the creation of the right configuration it
> should be sufficient to check the configuration file for the network in
> /userdata/system-data/etc/NetworkManager/system-connection/ and compare
> them to example files. These files are created even if no network is
> available.

​Grea​t. That means we can mock (imitate) NetworkManager and query it
directly over dbus.

> I don't know what wifi infrastructures you have around, but I believe it
> is hard to get everyone.
> I've heard of wpa_supplicant being able to emulate different WPA
> networks, but I had not have the time to look into that.
>

​I don't think that's necessary at this stage. WPA2 enterprise isn't
critical judging by the level of bug reporting.

> My connection test on a TTLS/MSCHAPv2 eduroam was established
> successfully. Maybe it would be best to let people test it with there
> networks.
>
>
​Agreed.​

> Hence, for testing and maybe autopilot testing for an example connection

​I can start this when I have free cycles.​

> I do not know anything about autopilot testing so far. If you believe we
> can get this running, I just could support you.
>
>
​No worries. I'll propose a branch against this branch.​

​Thanks,
Jonas​

[JkB (joergberroth)]

Am 2015-06-05 um 22:51 schrieb Jonas G. Drange:
> On 5 June 2015 at 20:57, JkB <email address hidden> wrote:
>
>> First,
>> 4.-6. To which diff/file do your line numbers refer to. I don't get them
>> aligned with my r1401 into r1435.
>>
>>
> ​I meant the web diff [1]. I am not certain as to why I did not use the
> inline comment system. Sorry!
>
> [1]
> https://code.launchpad.net/~joergberroth/ubuntu-system-settings/wifi-802-1x-configurations/+merge/261022/+preview-diff/629978/+files/preview.diff
> ​
Checked that, but still don't get it, where is the offset?
>
>
>> If you just want to test the creation of the right configuration it
>> should be sufficient to check the configuration file for the network in
>> /userdata/system-data/etc/NetworkManager/system-connection/ and compare
>> them to example files. These files are created even if no network is
>> available.
>
>
> ​Grea​t. That means we can mock (imitate) NetworkManager and query it
> directly over dbus.

Yes, sounds like an idea!
>
>

[Jonas G. Drange (jonas-drange)]

Great. Only two minor comments. :) I have yet to test this on eduroam, but will hopefully get it tested this week.

review: Needs Information

[lp:~joergberroth/ubuntu-system-settings/wifi-802-1x-configurations]

1405. By JkB on 2015-06-15

* added QStandardPaths for cert handling
* improved getting secrets in Previous network to get wpa-eap passwords as well.
* restored .bzrignore

[JkB (joergberroth)]

Fixed that and also improved getting secrets for PreviousNetworks page.
Looking forward to your test results.
Thanks again.

Am 2015-06-15 um 15:33 schrieb Jonas G. Drange:
> Review: Needs Information
>
> Great. Only two minor comments. :) I have yet to test this on eduroam, but will hopefully get it tested this week.
>
> Diff comments:
>
>> === modified file '.bzrignore'
>> --- .bzrignore 2014-07-25 08:22:52 +0000
>> +++ .bzrignore 2015-06-15 00:18:56 +0000
>> @@ -1,22 +1,2 @@
>> -/build
>> -*.debhelper
>> -*.log
>> -*.moc
>> -CMakeLists.txt.user
>> -moc_*
>> -Makefile*
>> -tst_*
>> -lib/SystemSettings/SystemSettings.pc
>> -src/qrc_ui.cpp
>> -src/system-settings
>> -system-settings.pro.user
>> -/debian/files
>> -/debian/libsystemsettings-dev/
>> -/debian/libsystemsettings1/
>> -/debian/tmp/
>> -/debian/ubuntu-system-settings/
>> -/debian/ubuntu-system-settings-example/
>> -.cproject
>> -.project
>> -.settings
>> -__pycache__
>> +*.txt_testingjkb
>
> What warrants all these changes to the bzrignore?
>
>> +./CMakeLists.txt.user
>>
>> === modified file 'plugins/wifi/CMakeLists.txt'
>> --- plugins/wifi/CMakeLists.txt 2014-09-15 15:39:50 +0000
>> +++ plugins/wifi/CMakeLists.txt 2015-06-15 00:18:56 +0000
>> @@ -1,6 +1,8 @@
>> set(QML_SOURCES
>> AccessPoint.qml
>> BaseMenuItem.qml
>> +CertPicker.qml
>> +CertDialog.qml
>> Common.qml
>> DivMenuItem.qml
>> FramedMenuItem.qml
>> @@ -23,10 +25,12 @@
>> plugin.cpp
>> unitymenumodelstack.cpp
>> previousnetworkmodel.cpp
>> + certhandler.cpp
>> wifidbushelper.h
>> plugin.h
>> unitymenumodelstack.h
>> previousnetworkmodel.h
>> + certhandler.h
>> nm_manager_proxy.h
>> nm_settings_proxy.h
>> nm_settings_connection_proxy.h
>>
>> === added file 'plugins/wifi/CertDialog.qml'
>> --- plugins/wifi/CertDialog.qml 1970-01-01 00:00:00 +0000
>> +++ plugins/wifi/CertDialog.qml 2015-06-15 00:18:56 +0000
>> @@ -0,0 +1,92 @@
>> +import QtQuick 2.0
>> +import QtQuick.Layouts 1.1
>> +import Ubuntu.Components.Popups 0.1
>> +import Ubuntu.Components 0.1
>> +import Ubuntu.Components.ListItems 0.1 as ListItem
>> +import Ubuntu.SystemSettings.Wifi 1.0
>> +
>> +Component {
>> +
>> + Dialog {
>> + id: certDialog
>> +
>> + property var certType;
>> + property var fileName;
>> +
>> + signal updateSignal(var update);
>> +
>> + anchors.fill: parent
>> +
>> + title: {
>> + if (certType === 0){ // certificate
>> + {i18n.tr("Add certificate")+"?"};
>> + } else if (certType === 1){ // privatekey
>> + {i18n.tr("Add key")+"?"};
>> + } else if (certType === 2){ // pacFile
>> + {i18n.tr("Add pac file")+"?"};
>> + }
>> + }
>> +
>> + FileHandler {
>> + id: fileHandler
>> + }
>> +
>> + Label {
>> + id: certContentLabel
>> + text : {i18n.tr("Content")+":"}
>> + objectName: "certContentLabel"
>> + fontSize: "medium"
>> + font.bold: false
>> + }
>> +
>> + TextArea {
>> + id : certContent
>> + objectName: "certContent"
>> + readOnly: true...

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1405
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2153/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/118
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-wily-amd64-ci/14
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-wily-i386-ci/14
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/77
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/118
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/118/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21275

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2153/rebuild

review: Approve (continuous-integration)

[lp:~joergberroth/ubuntu-system-settings/wifi-802-1x-configurations]

1406. By JkB on 2015-06-16

merge with trunk

1407. By JkB on 2015-06-24

merged with jgdx merge proposal. Thanks a lot Jonas for the extensive format fixes!
+Also, considered some quickly managable FIXMEs from Jonas. Some stay.

[Jonas G. Drange (jonas-drange)]

Tried connecting to an eduroam network yesterday. I don't have a syslog, and the System Settings log looked normal. However, this [1] is what System Settings produced in /etc/NetworkManager/system-connections/eduroam. I am puzzled that there's a type=wifi entry in [connection], since there's no such type [2].

Sadly the eduroam connection failed. I followed normal eduroam connection settings (PEAP, mschapv2).

Creating the same connection using nm-applet, creates the following /etc/NetworkManager/system-connections/eduroam file [3].

[1] http://pastebin.ubuntu.com/11772095/
[2] https://developer.gnome.org/NetworkManager/stable/ref-settings.html
[3] http://pastebin.ubuntu.com/11772332/

review: Needs Information

[JkB (joergberroth)]

Thanks for testing this with peap.

First, the type String is set by nm after sending over the configuration
data with the original "802-11-wireless" string as type.
So this seems to be changed by nm. I have not had a closer look t this,
yet. But I think this does not matter, as for my eduroam network
(TTLS/MChapv2) it works.

In general:
Have you got the orange feedback text over the button row? What does it
tell?

If nm fails with the configuration it states a warning visible in the
system-settings log in .cache/upstart/.

And anyway,
I haven't yet spent a lot time on the peap configuration,
and it seems that I forgot to add the ca-cert integration for PEAP!

Don't you need the ca-cert for your eduroam (wherever this is) ?

And than there are two more points:
the peap-label check and the version check.
At the moment I am not sure what is really needed to ask the user, so I
will check that as well
and come back with a fix tonight.

[Jonas G. Drange (jonas-drange)]

On 25 June 2015 at 13:21, JkB <email address hidden> wrote:

> First, the type String is set by nm after sending over the configuration
> data with the original "802-11-wireless" string as type.
>

​I'll confirm this using autopilot testing. But we need to find and
eliminate the case in which 'wifi' is sent by the binding (if ever). I'll
try to discover this via testing.​

> as for my eduroam network
> ​ ​
> (TTLS/MChapv2) it works.
>

​It would be interesting to see this configuration if it works. What you
could do is to pastebin this file:

/etc/NetworkManager/system-connections/eduroam

Remove all private information before pasting :)​
​

In general:
> Have you got the orange feedback text over the button row? What does it
> tell?
>

​I did notice the feedback, but I saw in my syslog that it wouldn't
associate.​

If nm fails with the configuration it states a warning visible in the
> system-settings log in .cache/upstart/.
>

​Okay, will look there.​

> And anyway,
> I haven't yet spent a lot time on the peap configuration,
> and it seems that I forgot to add the ca-cert integration for PEAP!
>

​Looking forward to that :)​

> Don't you need the ca-cert for your eduroam (wherever this is) ?
>

​No, not according to the instructions on my Uni's site:
https://it.uib.no/en/How_to_connect_wireless_to_eduroam​

> And than there are two more points:
> the peap-label check and the version check.
> At the moment I am not sure what is really needed to ask the user, so I
> will check that as well
> and come back with a fix tonight.

​Awesome!

[lp:~joergberroth/ubuntu-system-settings/wifi-802-1x-configurations]

1408. By JkB on 2015-06-25

* fixed wpa-eap/peap configurations.
* added "certificates recommended" security hint.

1409. By JkB on 2015-06-25

*merged with trunk

[JkB (joergberroth)]

Am 2015-06-25 um 15:06 schrieb Jonas G. Drange:

> ​It would be interesting to see this configuration if it works. What you
> could do is to pastebin this file:
>
This is the eduroam config written on connection on ubuntu phone:

http://paste.ubuntu.com/11776155/

Never recognized the change in labeling before, though.

>
>> Don't you need the ca-cert for your eduroam (wherever this is) ?
> ​No, not according to the instructions on my Uni's site:
> https://it.uib.no/en/How_to_connect_wireless_to_eduroam​

Also, I added a hint in the dialog, that connecting to a network with
choosing a cert is more secure.

>> And than there are two more points:
>> the peap-label check and the version check.

I commited a fix against that. It would be great if you could test this
again.
Could be that the fault was in forcing "phase1-peaplabel" = 1. Hopefully.

Thanks.

[Jonas G. Drange (jonas-drange)]

On 26 June 2015 at 08:04, JkB <email address hidden> wrote:

> http://paste.ubuntu.com/11776155/
>

​If that works for you, let's assume that connection.type 'wifi' is valid,
even though it's not documented.

Also, I added a hint in the dialog, that connecting to a network with
> choosing a cert is more secure.
>

Okay, but we need to make sure design is involved, so if there's nothing in
the spec [1] about this, we have to create a bug against System Settings
which affects ubuntu-ux. What's the basis for this hint?​
​

> >> And than there are two more points:
> >> the peap-label check and the version check.
>
> I commited a fix against that. It would be great if you could test this
> again.

​Will do! I see that the nm-applet (Ubuntu Desktop's way of connecting to
hidden networks) does not force phase1-peaplabel=1, however, it does
include password-flags=1 instead of password-flags=2.​

​Here's [2] the work on autopilot tests for your branch​. There are some
notable changes that affects your branch, not directly related to autopilot
tests:

   - Auth methods and protocols are no longer translated (e.g. PEAP,
   MSCHAPv2, and so on.)
   - Your feedback change has been reverted for the following reasons:
      - It's in the spec [3].
      - The tests depend on the feedback existing in the text property of
      the Dialog.
      - The Dialog provides the 'text' property, so why would we not use it
      for feedback important to the user? :)
      - If visibility is a problem, we should to scroll to the top of the
      dialog. This is the pattern in other dialogs as well.
   - One fixme has been re-added, but I'll take care of it. :)

I need suggestions on what to test. What are other popular WPA2 enterprise
configurations? Do you have suggestions, Joerg?

Also, anything you'd like me to test?

Thanks,
Jonas.

​[1]
https://wiki.ubuntu.com/Networking#Authentication_variations.2C_certificates.2C_and_PAC_files
​
[2]
https://code.launchpad.net/~jonas-drange/ubuntu-system-settings/wifi-802-1x-configurations-tests/+merge/263092
​[3]
https://wiki.ubuntu.com/Networking?action=AttachFile&do=get&target=wi-fi-authentication-key-error.phone.png
​

[JkB (joergberroth)]

Am 2015-06-26 um 13:51 schrieb Jonas G. Drange:
> On 26 June 2015 at 08:04, JkB <email address hidden> wrote:

> ​If that works for you, let's assume that connection.type 'wifi' is valid,
> even though it's not documented.

Yes. And you'll see also for [wifi-security] one changed that from
[802-11-wireless-security]...

>
> Also, I added a hint in the dialog, that connecting to a network with
>> choosing a cert is more secure.
>>
>
> Okay, but we need to make sure design is involved, so if there's nothing in
> the spec [1] about this, we have to create a bug against System Settings
> which affects ubuntu-ux. What's the basis for this hint?​
You're right. I will comment it until than.
The idea behind this is, that without certification, the user can not be
sure that he is connecting to a real e.g. "eduroam" which could be a
security problem.
On the other side it's not up to the user to fix that but to the admin
that owns the network.
So, difficult.

>
>>>> And than there are two more points:
>>>> the peap-label check and the version check.
>>
>> I commited a fix against that. It would be great if you could test this
>> again.
>
>
> ​Will do! I see that the nm-applet (Ubuntu Desktop's way of connecting to
> hidden networks) does not force phase1-peaplabel=1, however, it does
> include password-flags=1 instead of password-flags=2.​
That's right.
I removed forcing peap-label and put in an itemselector for choosing
peap-version instead as this is more common.

About password-flags: [1]
password-flags=2 is issued if the password shall not be saved.

I left the flags out if pw is to be saved. defaults to 0.

>
>
> ​Here's [2] the work on autopilot tests for your branch​. There are some
Will have a look at this later.
> notable changes that affects your branch, not directly related to autopilot
> tests:
>
> - Auth methods and protocols are no longer translated (e.g. PEAP,
> MSCHAPv2, and so on.)

ok!

> - Your feedback change has been reverted for the following reasons:

> - If visibility is a problem, we should to scroll to the top of the
> dialog. This is the pattern in other dialogs as well.
That was the point I was thinking about. It is more user friendly to
have it appear right in sight over the "command" buttons.
But, you are right, scrolling would do in a way, too.
And as the tests already depend on that I will change it back.
Maybe one can think about this later.

> - One fixme has been re-added, but I'll take care of it. :)
I removed it, as I already translate it in the certhandler.cpp !
so if you add the translation in this file, we should remove it in the
handler. What is more common?
>
> I need suggestions on what to test. What are other popular WPA2 enterprise
> configurations? Do you have suggestions, Joerg?
I'm not a pro in that but during the last days ;-) I read of peap and
TLS being the most common. So, the TLS config would be a point to start.

>
> Also, anything you'd like me to test?
And as I have no auto tests, checking whether all the parameters are
sent and put in right into configuration would be great. I then would go
through all the config files created.

Really looking forward to your te...

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1409
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2166/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/199
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-wily-amd64-ci/27
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-wily-i386-ci/27
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/133
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/199
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/199/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21515

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2166/rebuild

review: Needs Fixing (continuous-integration)

[lp:~joergberroth/ubuntu-system-settings/wifi-802-1x-configurations]

1410. By JkB on 2015-06-26

merge jonas branch

1411. By JkB on 2015-06-26

merge with trunk

1412. By JkB on 2015-06-27

* set feedback back to original implementation

[Jonas G. Drange (jonas-drange)]

> >> I commited a fix against that. It would be great if you could test this
> >> again.

I have tested connecting to eduroam on both Mako (Nexus 4) and Meizu's phone—it works! :)

I feel confident we are ready to land this, however, I just proposed merging [1] into this branch. It fixes the last fixmes. :)

[1] https://code.launchpad.net/~jonas-drange/ubuntu-system-settings/wifi-802-1x-configurations-fixmes/+merge/263242

[JkB (joergberroth)]

Am 2015-06-29 um 16:05 schrieb Jonas G. Drange:
>>>> I commited a fix against that. It would be great if you could test this
>>>> again.
>
> I have tested connecting to eduroam on both Mako (Nexus 4) and Meizu's phone—it works! :)

Great! Have you tested using certificates for your connection as well?
>
> I feel confident we are ready to land this, however, I just proposed merging [1] into this branch. It fixes the last fixmes. :)
>

Ok. I will have a look at them tonight; It seems that I then can remove
translations in the certhandler.cpp itself.
Do you think it is really necessary to translate names (CommonName,
Organization) ?

Thanks.

> [1] https://code.launchpad.net/~jonas-drange/ubuntu-system-settings/wifi-802-1x-configurations-fixmes/+merge/263242
>

[Matthew Paul Thomas (mpt)]

"The idea behind this is, that without certification, the user can not be sure that he is connecting to a real e.g. "eduroam" which could be a security problem. On the other side it's not up to the user to fix that but to the admin that owns the network. So, difficult."

There is precedent for this: I specced that the dialog should warn that WEP networks are inherently insecure.

You seem to be talking about a different case, though, where connecting to a network without a certificate leaves you vulnerable to connecting accidentally to a different network with the same name later. But it's not clear to me how that problem is any worse for authentication types that allow certificates than for authentication types that don't. That's bug 1258496, which is a problem for any authentication type. If there's something that TLS/PEAP etc can do specifically for that, please comment in that bug report; or if you're talking about something different, report a separate bug.

[Jonas G. Drange (jonas-drange)]

On 29 June 2015 at 17:51, JkB <email address hidden> wrote:

> Great! Have you tested using certificates for your connection as well?
>

​No, I don't have this opportunity.​

> Ok. I will have a look at them tonight; It seems that I then can remove
> translations in the certhandler.cpp itself.
>

​No, “None” and “Choose” are still translated.​

> Do you think it is really necessary to translate names (CommonName,
> Organization) ?
>

​When we do i18n.tr("%1…").arg(Organization), we allow translators to
choose how this is translated, but Organization name just replaces %1 and
is not translated.​

So, in Norwegian, if we elided words using “–bork”, a translator just
changes “%1…” into “%1–bork”.

Thank you.

[JkB (joergberroth)]

> ​No, I don't have this opportunity.

According to a script, I found for your University?! there is a cert
chain in the script [1].
You could try this....

@mpt:
The problem I talked about is in a way about the man in the tent as
described in the bug.
To my understanding, the advantage of WPA Enterprise networks is that
you can be sure to connect to the right access point, if it carries a
valid certificate (or let's say it's way harder to build an "evil twin"
as you don't own the cert).

For example, the University of Bergen works with certificates [1], but
not as a must have [2]. There seems to be an older auth scheme as well.
Maybe
@Jonas can clarify this?
In general this is a IT department thing and the user only could ask for
it. Thats's why I also question providing a hint.

Nevertheless, suggesting the user to inform him/-herself about existing
certificates that could be used, increases security.

What do you think?

>
>
>> Ok. I will have a look at them tonight; It seems that I then can remove
>> translations in the certhandler.cpp itself.
>>
>
> ​No, “None” and “Choose” are still translated.​
Of course, yes.
I was thinking of two translations _("Private key") and _("Public key")
which are passed as quasi constants. But I see, they will be kept also,
well?

>
> So, in Norwegian, if we elided words using “–bork”, a translator just
> changes “%1…” into “%1–bork”.
ok. :-).

Thanks a lot.

[1] https://eduroam.no/connect/?institution=535;profile=1751;os=linux
[2] https://it.uib.no/en/Eduroam_for_Linux

[lp:~joergberroth/ubuntu-system-settings/wifi-802-1x-configurations]

1413. By JkB on 2015-06-29

merge Jonas fixmes

1414. By JkB on 2015-06-29

clear spaces

1415. By JkB on 2015-06-29

merge with trunk

[Jonas G. Drange (jonas-drange)]

>
> > ​No, I don't have this opportunity.
>
> According to a script, I found for your University?! there is a cert
> chain in the script [1].
>

​Oh, sorry! Great find, I'll give it a go tomorrow.

[Jonas G. Drange (jonas-drange)]

​I just made a successful connection to eduroam using the certificate provided by eduroam.

There was a lesser issue that the ItemSelector was had selectedIndex 0 after the .pem was added. This is due to bug [1] which will not be fixed by the UI toolkit. The real solution is to use a ListModel [2].

We can fix this in a subsequent branch, I don't think it's a show stopper at this point, as eduroam allows certificate-less connections.

[1] https://bugs.launchpad.net/ubuntu/+source/ubuntu-ui-toolkit/+bug/1421653​
[2] ​http://qt-project.org/doc/qt-5/qml-qtqml-models-listmodel.html​

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1415
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2175/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/233/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-wily-amd64-ci/36
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-wily-i386-ci/36
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/157/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/233
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/233/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21597

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2175/rebuild

review: Needs Fixing (continuous-integration)

[lp:~joergberroth/ubuntu-system-settings/wifi-802-1x-configurations]

1416. By JkB on 2015-07-01

* multiple %1 args in i18n.tr all fall back to the first arg() provided.
Is this an individuell problem of my build?
If not we should consider this last commit.

1417. By JkB on 2015-07-01

* only show "using certificate.." hint if selected one == "None"

[Jonas G. Drange (jonas-drange)]

Thanks Joerg, for fixing the translation issues, as well as improving the cert ui. If there are no more critical issues in this branch, I want to land it as is—this means no more commits after this approve. :) This way we can get your branch into OTA5 (next system update).

review: Approve

[JkB (joergberroth)]

Am Donnerstag, 2. Juli 2015 00:29:27 CEST
> after this approve. :) This way we can get your branch into OTA5
> (next system update).
>
Thats it! Thanks a lot jonas!

--
Versandt, mit Dekko von meinem Ubuntu-Gerät

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1417
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2176/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/247/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-wily-amd64-ci/37
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-wily-i386-ci/37
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/168/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/247
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/247/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21626

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2176/rebuild

review: Needs Fixing (continuous-integration)

=== modified file 'plugins/wifi/CMakeLists.txt'
--- plugins/wifi/CMakeLists.txt	2014-09-15 15:39:50 +0000
+++ plugins/wifi/CMakeLists.txt	2015-07-01 18:56:14 +0000
@@ -1,6 +1,8 @@
 set(QML_SOURCES
 AccessPoint.qml
 BaseMenuItem.qml
+CertPicker.qml
+CertDialog.qml
 Common.qml
 DivMenuItem.qml
 FramedMenuItem.qml
@@ -23,10 +25,12 @@
   plugin.cpp
   unitymenumodelstack.cpp
   previousnetworkmodel.cpp
+  certhandler.cpp
   wifidbushelper.h
   plugin.h
   unitymenumodelstack.h
   previousnetworkmodel.h
+  certhandler.h
   nm_manager_proxy.h
   nm_settings_proxy.h
   nm_settings_connection_proxy.h

=== added file 'plugins/wifi/CertDialog.qml'
--- plugins/wifi/CertDialog.qml	1970-01-01 00:00:00 +0000
+++ plugins/wifi/CertDialog.qml	2015-07-01 18:56:14 +0000
@@ -0,0 +1,94 @@
+import QtQuick 2.0
+import QtQuick.Layouts 1.1
+import Ubuntu.Components.Popups 0.1
+import Ubuntu.Components 0.1
+import Ubuntu.Components.ListItems 0.1 as ListItem
+import Ubuntu.SystemSettings.Wifi 1.0
+
+Component {
+
+    Dialog {
+        id: certDialog
+
+        property var certType;
+        property var fileName;
+
+        signal updateSignal(var update);
+
+        anchors.fill: parent
+
+        title: {
+            if (certType === 0) { // certificate
+                return i18n.tr("Add certificate?");
+            } else if (certType === 1) { // privatekey
+                return i18n.tr("Add key?");
+            } else if (certType === 2) { // pacFile
+                return i18n.tr("Add pac file?");
+            }
+        }
+
+        FileHandler {
+            id: fileHandler
+        }
+
+        Label {
+            id: certContentLabel
+            text : i18n.tr("Content:")
+            objectName: "certContentLabel"
+            fontSize: "medium"
+            font.bold: false
+        }
+
+        TextArea {
+            id : certContent
+            objectName: "certContent"
+            readOnly: true
+            width: parent.width
+            autoSize: true
+            maximumLineCount: 7
+            placeholderText: i18n.tr("No data available.")
+            text: fileHandler.getCertContent(certDialog.fileName).toString()
+        }
+
+        RowLayout {
+            id: buttonRow
+            anchors {
+                left: parent.left
+                right: parent.right
+            }
+            spacing: units.gu(2)
+            height: cancelButton.height
+
+            Button {
+                id: cancelButton
+                Layout.fillWidth: true
+                text: i18n.tr("Cancel")
+                onClicked: {
+                    fileHandler.removeFile(certDialog.fileName);
+                    PopupUtils.close(certDialog);
+                }
+            }
+
+            Button {
+                id: saveButton
+                text: i18n.tr("Save")
+                Layout.fillWidth: true
+                enabled: (certDialog.certContent.text !== "")
+                onClicked: { if (certType === 0) { // certificate
+                        fileHandler.moveCertFile(certDialog.fileName);
+                    } else if (certType === 1) { // privatekey
+                        fileHandler.moveKeyFile(certDialog.fileName);
+                    } else if (certType === 2) { // pacFile
+                        fileHandler.movePacFile(certDialog.fileName);
+                    }
+
+                    /* Just to be sure source file will be deleted if move was
+                    not successfull */
+                    fileHandler.removeFile(certDialog.fileName);
+                    certDialog.updateSignal(true);
+                    PopupUtils.close(certDialog);
+                }
+            }
+        }
+    }
+}

=== added file 'plugins/wifi/CertPicker.qml'
--- plugins/wifi/CertPicker.qml	1970-01-01 00:00:00 +0000
+++ plugins/wifi/CertPicker.qml	2015-07-01 18:56:14 +0000
@@ -0,0 +1,58 @@
+import QtQuick 2.0
+import QtQuick.Layouts 1.1
+import Ubuntu.Components 0.1
+import Ubuntu.Components.Popups 0.1
+import Ubuntu.Content 0.1
+
+PopupBase  {
+    id: picker
+
+    signal fileImportSignal (var file)
+    property var activeTransfer
+
+    Rectangle {
+        anchors.fill: parent
+
+        ContentTransferHint {
+            id: transferHint
+            anchors.fill: parent
+            activeTransfer: picker.activeTransfer
+        }
+
+        ContentStore {
+            id: appStore
+            scope: ContentScope.App
+        }
+
+        ContentPeerPicker {
+            id: peerPicker
+            anchors.fill: parent
+            visible: true
+            contentType: ContentType.Documents
+            handler: ContentHandler.Source
+            onPeerSelected: {
+                peer.selectionType = ContentTransfer.Single;
+                picker.activeTransfer = peer.request(appStore);
+            }
+            onCancelPressed: PopupUtils.close(picker)
+        }
+    }
+
+    Connections {
+        target: picker.activeTransfer ? picker.activeTransfer : null
+        onStateChanged: {
+            if (picker.activeTransfer.state === ContentTransfer.Charged) {
+                if (picker.activeTransfer.items.length > 0) {
+                    var fileUrl = picker.activeTransfer.items[0].url;
+                    picker.fileImportSignal(
+                        fileUrl.toString().replace("file://", "")
+                    );
+                    PopupUtils.close(picker);
+                }
+            } else if (picker.activeTransfer.state === ContentTransfer.Aborted){
+                picker.fileImportSignal(false);
+                PopupUtils.close(picker);
+            }
+        }
+    }
+}

=== modified file 'plugins/wifi/OtherNetwork.qml'
--- plugins/wifi/OtherNetwork.qml	2015-01-09 08:47:53 +0000
+++ plugins/wifi/OtherNetwork.qml	2015-07-01 18:56:14 +0000
@@ -31,21 +31,53 @@
         objectName: "otherNetworkDialog"
         anchorToKeyboard: true
 
-        function settingsValid() {
-            if(networkname.length == 0) {
+        function settingsValid () {
+            if (networkname.length === 0) {
                 return false;
             }
-            if(securityList.selectedIndex == 0) {
+            if (securityList.selectedIndex === 0) {
                 return true
             }
-            if(securityList.selectedIndex == 1) {
-                return password.length >= 8
+            if (securityList.selectedIndex === 3) {
+                // WEP
+                return password.length === 5  ||
+                       password.length === 10 ||
+                       password.length === 13 ||
+                       password.length === 26;
             }
-            // WEP
-            return password.length === 5  ||
-                   password.length === 10 ||
-                   password.length === 13 ||
-                   password.length === 26;
+            //WPA
+            return password.length >= 8
+        }
+
+        function filePicker (type) {
+            var pickerDialog;
+            var certDialog;
+
+            pickerDialog = PopupUtils.open(
+                Qt.resolvedUrl("./CertPicker.qml")
+            );
+            pickerDialog.fileImportSignal.connect(function (file) {
+                if (!file === false) {
+                    certDialogLoader.source = Qt.resolvedUrl(
+                        "./CertDialog.qml"
+                    );
+                    certDialog = PopupUtils.open(
+                        certDialogLoader.item, authListLabel, {
+                            fileName: file,
+                            certType: type
+                        }
+                    );
+                    certDialog.updateSignal.connect(function (update) {
+                        if (update && type === 0) {
+                            cacertListModel.dataupdate();
+                        } else if (update && type === 1) {
+                            privatekeyListModel.dataupdate();
+                        } else if (update && type === 2) {
+                            pacFileListModeL.dataupdate();
+                        }
+                    });
+                }
+            });
         }
 
         title: i18n.tr("Connect to Hidden Network")
@@ -67,6 +99,14 @@
                     running: true
                 }
                 PropertyChanges {
+                    target: passwordRememberSwitch
+                    enabled: false
+                }
+                PropertyChanges {
+                    target: passwordRememberLabel
+                    opacity: 0.5
+                }
+                PropertyChanges {
                     target: passwordVisibleSwitch
                     enabled: false
                 }
@@ -79,7 +119,103 @@
                     enabled: false
                 }
                 PropertyChanges {
-                    target: passwordListLabel
+                    target: passwordLabel
+                    opacity: 0.5
+                }
+                PropertyChanges {
+                    target: username
+                    enabled: false
+                }
+                PropertyChanges {
+                    target: usernameLabel
+                    opacity: 0.5
+                }
+                PropertyChanges {
+                    target: anonymousIdentity
+                    enabled: false
+                }
+                PropertyChanges {
+                    target: anonymousIdentityLabel
+                    opacity: 0.5
+                }
+                PropertyChanges {
+                    target: peapVersionList
+                    enabled: false
+                    opacity: 0.5
+                }
+                PropertyChanges {
+                    target: peapVersionListLabel
+                    opacity: 0.5
+                }
+                PropertyChanges {
+                    target: pacProvisioningList
+                    enabled: false
+                    opacity: 0.5
+                }
+                PropertyChanges {
+                    target: pacProvisioningListLabel
+                    opacity: 0.5
+                }
+                PropertyChanges {
+                    target: pacFileSelector
+                    enabled: false
+                    opacity: 0.5
+                }
+                PropertyChanges {
+                    target: pacFileLabel
+                    opacity: 0.5
+                }
+                PropertyChanges {
+                    target: privateKeySelector
+                    enabled: false
+                    opacity: 0.5
+                }
+                PropertyChanges {
+                    target: privatekeyLabel
+                    opacity: 0.5
+                }
+                PropertyChanges {
+                    target: usercertSelector
+                    enabled: false
+                    opacity: 0.5
+                }
+                PropertyChanges {
+                    target: usercertLabel
+                    opacity: 0.5
+                }
+                PropertyChanges {
+                    target: cacertSelector
+                    enabled: false
+                    opacity: 0.5
+                }
+                PropertyChanges {
+                    target: cacertLabel
+                    opacity: 0.5
+                }
+                PropertyChanges {
+                    target: p2authList
+                    enabled: false
+                    opacity: 0.5
+                }
+                PropertyChanges {
+                    target: p2authListLabel
+                    opacity: 0.5
+                }
+                PropertyChanges {
+                    target: authList
+                    enabled: false
+                    opacity: 0.5
+                }
+                PropertyChanges {
+                    target: authListLabel
+                    opacity: 0.5
+                }
+                PropertyChanges {
+                    target: wepInsecureLabel
+                    opacity: 0.5
+                }
+                PropertyChanges {
+                    target: wepInsecureLabel
                     opacity: 0.5
                 }
                 PropertyChanges {
@@ -117,10 +253,7 @@
                     target: successIndicator
                     running: true
                 }
-                PropertyChanges {
-                    target: cancelButton
-                    enabled: false
-                }
+
                 PropertyChanges {
                     target: connectAction
                     enabled: false
@@ -142,7 +275,7 @@
             text : i18n.tr("Network name")
             objectName: "networknameLabel"
             fontSize: "medium"
-            font.bold: true
+            font.bold: false
             color: Theme.palette.selected.backgroundText
             elide: Text.ElideRight
         }
@@ -150,6 +283,8 @@
         TextField {
             id : networkname
             objectName: "networkname"
+            width: parent.width
+            placeholderText: i18n.tr("SSID")
             inputMethodHints: Qt.ImhNoPredictiveText
             Component.onCompleted: forceActiveFocus()
         }
@@ -159,7 +294,7 @@
             text : i18n.tr("Security")
             objectName: "securityListLabel"
             fontSize: "medium"
-            font.bold: true
+            font.bold: false
             color: Theme.palette.selected.backgroundText
             elide: Text.ElideRight
         }
@@ -167,18 +302,480 @@
         ListItem.ItemSelector {
             id: securityList
             objectName: "securityList"
-            model: [i18n.tr("None"),                 // index: 0
-                    i18n.tr("WPA & WPA2 Personal"),  // index: 1
-                    i18n.tr("WEP"),                  // index: 2
-                    ]
-        }
-
-        Label {
-            id: passwordListLabel
-            text : i18n.tr("Password")
+            model: [i18n.tr("None"),             // index: 0
+                i18n.tr("WPA & WPA2 Personal"),  // index: 1
+                i18n.tr("WPA & WPA2 Enterprise"),// index: 2
+                i18n.tr("WEP"),                  // index: 3
+                i18n.tr("Dynamic WEP (802.1x)"), // index: 4
+                i18n.tr("LEAP"),                 // index: 5
+            ]
+            selectedIndex: 1
+        }
+
+        Label {
+            id: wepInsecureLabel
+            objectName: "wepInsecureLabel"
+            color: "red"
+            text: i18n.tr("This network is insecure.")
+            visible: securityList.selectedIndex === 3
+        }
+
+        Label {
+            id: authListLabel
+            text : i18n.tr("Authentication")
+            objectName: "authListLabel"
+            fontSize: "medium"
+            font.bold: false
+            color: Theme.palette.selected.backgroundText
+            elide: Text.ElideRight
+            visible: securityList.selectedIndex === 2 ||
+                     securityList.selectedIndex === 4
+        }
+
+        ListItem.ItemSelector {
+            id: authList
+            objectName: "authList"
+            model: ["TLS",  // index: 0
+                    "TTLS", // index: 1
+                    "LEAP", // index: 2
+                    "FAST", // index: 3
+                    "PEAP", // index: 4
+            ]
+            visible: securityList.selectedIndex === 2 ||
+                     securityList.selectedIndex === 4
+        }
+
+        Label {
+            id: p2authListLabel
+            text : i18n.tr("Inner authentication")
+            objectName: "p2authLabel"
+            fontSize: "medium"
+            font.bold: false
+            color: Theme.palette.selected.backgroundText
+            elide: Text.ElideRight
+            visible: (securityList.selectedIndex === 2 ||
+                      securityList.selectedIndex === 4 /* WPA or D-WEP */) &&
+                     (authList.selectedIndex === 1 ||
+                      authList.selectedIndex === 3 ||
+                      authList.selectedIndex === 4)
+        }
+
+        ListItem.ItemSelector {
+            id: p2authList
+            objectName: "p2authList"
+            width: parent.width
+            model: ["PAP",      // index: 0
+                    "MSCHAPv2", // index: 1
+                    "MSCHAP",   // index: 2
+                    "CHAP",     // index: 3
+                    "GTC",      // index: 4
+                    "MD5"       // index: 5
+            ]
+            visible: (securityList.selectedIndex === 2 ||
+                      securityList.selectedIndex === 4 /* WPA or D-WEP */) &&
+                     (authList.selectedIndex === 1 ||
+                      authList.selectedIndex === 3 ||
+                      authList.selectedIndex === 4)
+        }
+
+        Label {
+            id: cacertLabel
+            text : i18n.tr("CA certificate")
+            objectName: "cacertListLabel"
+            fontSize: "medium"
+            font.bold: false
+            color: Theme.palette.selected.backgroundText
+            visible: (securityList.selectedIndex === 2 ||
+                      securityList.selectedIndex === 4 /* WPA or D-WEP */) &&
+                     (authList.selectedIndex === 0 ||
+                      authList.selectedIndex === 1 ||
+                      authList.selectedIndex === 3 ||
+                      authList.selectedIndex === 4)
+        }
+
+        ListItem.ItemSelector {
+            id: cacertSelector
+            anchors {
+                left: parent.left
+                right: parent.right
+            }
+            visible: (securityList.selectedIndex === 2 ||
+                      securityList.selectedIndex === 4 /* WPA or D-WEP */) &&
+                     (authList.selectedIndex === 0 ||
+                      authList.selectedIndex === 1 ||
+                      authList.selectedIndex === 3 ||
+                      authList.selectedIndex === 4)
+            model: cacertListModel
+            expanded: false
+            delegate: certSelectorDelegate
+            selectedIndex: 0
+            property string cacertFileName: {
+                if (selectedIndex !== 0 &&
+                    selectedIndex !== (cacertListModel.rowCount()-1)) {
+                    return cacertListModel.getfileName(selectedIndex);
+                } else {
+                    return "";
+                }
+            }
+
+            onSelectedIndexChanged: {
+                if (selectedIndex === cacertListModel.rowCount()-1) {
+                    selectedIndex = 0;
+                    otherNetworkDialog.filePicker(0); //Certificate
+                }
+            }
+        }
+
+        Component {
+            id: certSelectorDelegate
+            OptionSelectorDelegate {
+                text: {
+                    if (CommonName.length > 32) {
+                        /* TRANSLATORS: %1 is the name of a certificate file.
+                        The ellipsis indicates that the file name has been
+                        truncated to 30 characters. */
+                        return i18n.tr("%1…").arg(CommonName.substr(0,30));
+                    } else {
+                        return CommonName;
+                    }
+                }
+
+                subText: {
+                    if (CommonName !== i18n.tr("None") &&
+                        CommonName !== i18n.tr("Choose…")) {
+                        if (Organization.length > 15) {
+                            /* TRANSLATORS: The first position is the name of
+                            the organization that has issued the certificate.
+                            The organization name has been truncated, as
+                            indicated by the ellipsis. The latter position is
+                            the expiry date of the certificate. */
+                            return i18n.tr("%1…, Exp.: %2").arg(
+                                Organization.substr(0,13)
+                            ).arg(expiryDate);
+                        } else {
+                            /* TRANSLATORS: The first position is the name of
+                            the organization that has issued the certificate.
+                            The latter position is the expiry date of the
+                            certificate. */
+                            return i18n.tr("%1, Exp.: %2").arg(Organization)
+                                .arg(expiryDate);
+                        }
+                    } else {
+                        return "";
+                    }
+                }
+            }
+        }
+
+        CertificateListModel {
+            id: cacertListModel
+        }
+
+        Loader {
+            id: certDialogLoader
+            asynchronous: false
+        }
+
+        Label {
+            id: cacertHintLabel
+            text : i18n.tr("Using certificates is recommend as it increases security.")
+            wrapMode: Text.WordWrap
+            opacity: 0.5
+            objectName: "cacertHintLabel"
+            fontSize: "small"
+            font.bold: false
+            color: Theme.palette.selected.backgroundText
+            visible: (securityList.selectedIndex === 2 ||
+                      securityList.selectedIndex === 4 /* WPA or D-WEP */) &&
+                     (authList.selectedIndex === 0 ||
+                      authList.selectedIndex === 1 ||
+                      authList.selectedIndex === 3 ||
+                      authList.selectedIndex === 4) &&
+                     cacertSelector.selectedIndex === 0
+        }
+
+        Label {
+            id: usercertLabel
+            text : i18n.tr("Client certificate")
+            objectName: "usercertLabel"
+            fontSize: "medium"
+            font.bold: false
+            color: Theme.palette.selected.backgroundText
+            visible: (securityList.selectedIndex === 2 ||
+                      securityList.selectedIndex === 4) &&
+                      authList.selectedIndex === 0 // only for TLS
+
+        }
+
+        ListItem.ItemSelector {
+            id: usercertSelector
+            anchors {
+                left: parent.left
+                right: parent.right
+            }
+            visible: (securityList.selectedIndex === 2 ||
+                      securityList.selectedIndex === 4) &&
+                      authList.selectedIndex === 0 // only for TLS
+            model: cacertListModel
+            expanded: false
+            delegate: certSelectorDelegate
+            selectedIndex: 0
+            property string usercertFileName: {
+                if (selectedIndex !== 0 &&
+                    selectedIndex !== (model.rowCount()-1)) {
+                      return model.getfileName(selectedIndex);
+                } else {
+                    return "";
+                }
+            }
+            onSelectedIndexChanged: {
+                if (selectedIndex === cacertListModel.rowCount()-1) {
+                    selectedIndex = 0;
+                    otherNetworkDialog.filePicker(0); //Certificate
+                }
+            }
+        }
+
+        Label {
+            id: privatekeyLabel
+            text : i18n.tr("User private key")
+            objectName: "userprivatekeyLabel"
+            fontSize: "medium"
+            font.bold: false
+            color: Theme.palette.selected.backgroundText
+            visible: (securityList.selectedIndex === 2 ||
+                      securityList.selectedIndex === 4) &&
+                     (authList.selectedIndex === 0) // only for TLS
+        }
+
+        PrivatekeyListModel {
+            id: privatekeyListModel
+        }
+
+        Component{
+            id: privatekeySelectorDelegate
+            OptionSelectorDelegate {
+                text: KeyName
+
+                subText: {
+                    if (KeyName !== i18n.tr("None") &&
+                        KeyName !== i18n.tr("Choose…")) {
+                        /* TRANSLATORS: The first position is the type of
+                        private key, second the key algorithm, and third the
+                        length of the key in bits. */
+                        return i18n.tr("%1, %2, %3 bit").arg(KeyType)
+                            .arg(KeyAlgorithm).arg(KeyLength);
+                    } else {
+                        return "";
+                    }
+                }
+            }
+        }
+
+        ListItem.ItemSelector {
+            id: privateKeySelector
+            anchors {
+                left: parent.left
+                right: parent.right
+            }
+            visible: (securityList.selectedIndex === 2 ||
+                      securityList.selectedIndex === 4) &&
+                     (authList.selectedIndex === 0) // only for TLS
+            model: privatekeyListModel
+            expanded: false
+            delegate: privatekeySelectorDelegate
+            selectedIndex: 0
+            property string privateKeyFileName: {
+                if (selectedIndex !== 0 &&
+                    selectedIndex !==
+                    (model.rowCount()-1)) {
+                    return model.getfileName(
+                        selectedIndex
+                    );
+                } else {
+                    return "";
+                }
+            }
+            onSelectedIndexChanged: {
+                if (selectedIndex === privatekeyListModel.rowCount()-1) {
+                    selectedIndex = 0;
+                    otherNetworkDialog.filePicker(1); //Key
+                }
+            }
+        }
+
+        Label {
+            id: pacFileLabel
+            text : i18n.tr("Pac file")
+            objectName: "pacFileLabel"
+            fontSize: "medium"
+            font.bold: false
+            color: Theme.palette.selected.backgroundText
+            visible: (securityList.selectedIndex === 2 ||
+                      securityList.selectedIndex === 4 /* WPA or D-WEP */) &&
+                      (authList.selectedIndex === 3)
+        }
+
+        PacFileListModel {
+            id: pacFileListModel
+        }
+
+        Component{
+            id: pacFileSelectorDelegate
+            OptionSelectorDelegate { text: pacFileName; }
+        }
+
+        ListItem.ItemSelector {
+            id: pacFileSelector
+            anchors {
+                left: parent.left
+                right: parent.right
+            }
+            visible: (securityList.selectedIndex === 2 ||
+                      securityList.selectedIndex === 4) &&
+                     (authList.selectedIndex === 3) // only for FAST
+            model: pacFileListModel
+            expanded: false
+            delegate: pacFileSelectorDelegate
+            selectedIndex: 0
+            property string pacFileName: {
+                if (selectedIndex !== 0 &&
+                    selectedIndex !== (pacFileListModel.rowCount()-1)) {
+                       return pacFileListModel.getfileName(selectedIndex);
+                } else {
+                    return "";
+                }
+            }
+            onSelectedIndexChanged: {
+                if (selectedIndex === pacFileListModel.rowCount()-1) {
+                    selectedIndex = 0;
+                    otherNetworkDialog.filePicker(2); //PacFile
+                }
+            }
+        }
+
+        Label {
+            id: pacProvisioningListLabel
+            text : i18n.tr("Pac provisioning")
+            objectName: "pacProvisioningListLabel"
+            fontSize: "medium"
+            font.bold: false
+            color: Theme.palette.selected.backgroundText
+            elide: Text.ElideRight
+            visible: (securityList.selectedIndex === 2 ||
+                      securityList.selectedIndex === 4) &&
+                      (authList.selectedIndex === 3)
+        }
+
+        ListItem.ItemSelector {
+            id: pacProvisioningList
+            objectName: "pacProvisioningList"
+            model: [i18n.tr("Disabled"),      // index: 0
+                i18n.tr("Anonymous"),         // index: 1
+                i18n.tr("Authenticated"),     // index: 2
+                i18n.tr("Both"),              // index: 3
+            ]
+            selectedIndex: 1
+            visible: (securityList.selectedIndex === 2 ||
+                      securityList.selectedIndex === 4) &&
+                     (authList.selectedIndex === 3)
+        }
+
+        Label {
+            id: peapVersionListLabel
+            text : i18n.tr("PEAP version")
+            objectName: "peapVersionListLabel"
+            fontSize: "medium"
+            font.bold: false
+            color: Theme.palette.selected.backgroundText
+            elide: Text.ElideRight
+            visible: (securityList.selectedIndex === 2 ||
+                      securityList.selectedIndex === 4) &&
+                      (authList.selectedIndex === 4)
+        }
+
+        ListItem.ItemSelector {
+            id: peapVersionList
+            objectName: "peapVersionList"
+            model: [i18n.tr("Version 0"),  // index: 0
+                i18n.tr("Version 1"),      // index: 1
+                i18n.tr("Automatic"),      // index: 2
+            ]
+            visible: (securityList.selectedIndex === 2 ||
+                      securityList.selectedIndex === 4) &&
+                     (authList.selectedIndex === 4)
+            selectedIndex: 2
+        }
+
+        Label {
+            id: anonymousIdentityLabel
+            text : i18n.tr("Anonymous identity")
+            objectName: "anonymousIdentityLabel"
+            fontSize: "medium"
+            font.bold: false
+            color: Theme.palette.selected.backgroundText
+            visible: (securityList.selectedIndex === 2 &&
+                      authList.selectedIndex !== 2)
+        }
+
+        TextField {
+            id : anonymousIdentity
+            objectName: "anonymousIdentity"
+            width: parent.width
+            visible: (securityList.selectedIndex === 2 &&
+                      authList.selectedIndex !== 2)
+            inputMethodHints: Qt.ImhNoPredictiveText
+            onAccepted: {
+                connectAction.trigger()
+            }
+        }
+
+        Label {
+            id: usernameLabel
+            text : {
+                if ((securityList.selectedIndex === 2 ||
+                    securityList.selectedIndex === 4) &&
+                    (authList.selectedIndex === 0 )) {
+                    return i18n.tr("Identity");
+                } else {
+                    return i18n.tr("Username");
+                }
+            }
+            objectName: "usernameLabel"
+            fontSize: "medium"
+            font.bold: false
+            color: Theme.palette.selected.backgroundText
+            elide: Text.ElideRight
+            visible: (securityList.selectedIndex === 2 ||
+                      securityList.selectedIndex === 4 ||
+                      securityList.selectedIndex === 5)
+        }
+
+        TextField {
+            id : username
+            objectName: "username"
+            width: parent.width
+            visible: (securityList.selectedIndex === 2 ||
+                      securityList.selectedIndex === 4 ||
+                      securityList.selectedIndex === 5)
+            inputMethodHints: Qt.ImhNoPredictiveText
+            onAccepted: connectAction.trigger()
+        }
+
+        Label {
+            id: passwordLabel
+            text: {
+                if ((securityList.selectedIndex === 2 ||
+                     securityList.selectedIndex === 4) &&
+                    (authList.selectedIndex === 0)) {
+                    return i18n.tr("Private key password");
+                } else {
+                    return i18n.tr("Password");
+                }
+            }
             objectName: "passwordListLabel"
             fontSize: "medium"
-            font.bold: true
+            font.bold: false
             color: Theme.palette.selected.backgroundText
             elide: Text.ElideRight
             visible: securityList.selectedIndex !== 0
@@ -187,16 +784,15 @@
         TextField {
             id : password
             objectName: "password"
+            width: parent.width
             visible: securityList.selectedIndex !== 0
             echoMode: passwordVisibleSwitch.checked ?
-                TextInput.Normal : TextInput.Password
+                      TextInput.Normal : TextInput.Password
             inputMethodHints: Qt.ImhNoPredictiveText
-            onAccepted: {
-                connectAction.trigger();
-            }
+            onAccepted: connectAction.trigger()
         }
 
-        Row {
+        Row {
             id: passwordVisiblityRow
             layoutDirection: Qt.LeftToRight
             spacing: units.gu(2)
@@ -222,7 +818,43 @@
                     }
                     onClicked: {
                         passwordVisibleSwitch.checked =
-                            !passwordVisibleSwitch.checked
+                                !passwordVisibleSwitch.checked
+                    }
+                }
+            }
+        }
+
+        Row {
+            id: passwordRememberRow
+            layoutDirection: Qt.LeftToRight
+            spacing: units.gu(2)
+            visible: ((securityList.selectedIndex === 2 ||
+                       securityList.selectedIndex === 4) &&
+                      (authList.selectedIndex === 1 ||
+                       authList.selectedIndex === 3 ||
+                       authList.selectedIndex === 4))
+
+            CheckBox {
+                id: passwordRememberSwitch
+                activeFocusOnPress: false
+            }
+
+            Label {
+                id: passwordRememberLabel
+                text : i18n.tr("Remember password")
+                objectName: "passwordRememberLabel"
+                fontSize: "medium"
+                color: Theme.palette.selected.backgroundText
+                elide: Text.ElideRight
+                height: passwordRememberSwitch.height
+                verticalAlignment: Text.AlignVCenter
+                MouseArea {
+                    anchors {
+                        fill: parent
+                    }
+                    onClicked: {
+                        passwordRememberSwitch.checked =
+                                !passwordRememberSwitch.checked
                     }
                 }
             }
@@ -289,7 +921,24 @@
                 DbusHelper.connect(
                     networkname.text,
                     securityList.selectedIndex,
-                    password.text);
+                    authList.selectedIndex,
+                    [
+                        username.text,
+                        anonymousIdentity.text
+                    ],
+                    [
+                        password.text,
+                        passwordRememberSwitch.checked
+                    ],
+                    [
+                        cacertSelector.cacertFileName,
+                        usercertSelector.usercertFileName,
+                        privateKeySelector.privateKeyFileName,
+                        pacFileSelector.pacFileName,
+                        pacProvisioningList.selectedIndex.toString(),
+                        peapVersionList.selectedIndex.toString()
+                    ],
+                    p2authList.selectedIndex);
                 otherNetworkDialog.state = "CONNECTING";
             }
         }
@@ -321,19 +970,18 @@
                 */
                 if (otherNetworkDialog.state === "CONNECTING") {
                     switch (newState) {
-                        case 120:
-                            feedback.text = common.reasonToString(reason);
-                            otherNetworkDialog.state = "FAILED";
-                            break;
-                        case 100:
-                            /* connection succeeded only if it was us that
+                    case 120:
+                        feedback.text = common.reasonToString(reason);
+                        otherNetworkDialog.state = "FAILED";
+                        break;
+                    case 100:
+                        /* connection succeeded only if it was us that
                             created it */
-                            otherNetworkDialog.state = "SUCCEEDED";
-                            break;
+                        otherNetworkDialog.state = "SUCCEEDED";
+                        break;
                     }
                 }
             }
         }
     }
 }
-

=== added file 'plugins/wifi/certhandler.cpp'
--- plugins/wifi/certhandler.cpp	1970-01-01 00:00:00 +0000
+++ plugins/wifi/certhandler.cpp	2015-07-01 18:56:14 +0000
@@ -0,0 +1,348 @@
+#include "certhandler.h"
+
+#include <QtQml>
+#include <QtQml/QQmlContext>
+#include <QtDebug>
+#include <QObject>
+#include <QSslCertificate>
+#include <QSslKey>
+#include <QAbstractListModel>
+#include <QDir>
+#include <QFile>
+
+
+QString appPath = QStandardPaths::writableLocation(QStandardPaths::DataLocation);
+#define CERTS_PATH appPath +"/wifi/ssl/certs/"
+#define KEYS_PATH  appPath +"/wifi/ssl/private/"
+#define PACS_PATH  appPath +"/wifi/ssl/pac/"
+
+#include <libintl.h>
+QString _(const char *text){
+    return QString::fromUtf8(dgettext(0, text));
+}
+
+QByteArray FileHandler::getCertContent(QString filename){
+    QFile file(filename);
+    if (!file.open(QIODevice::ReadOnly)) {
+        qWarning() << "Could not resolve File (" << filename << "): File does not exist or is empty." ;
+        return QByteArray();
+    }
+    else {
+        return file.readAll();
+    }
+}
+
+QString FileHandler::moveCertFile(QString filename){
+    QDir certPath(CERTS_PATH);
+    if (!certPath.exists(CERTS_PATH)){
+        certPath.mkpath(CERTS_PATH);
+    }
+    QFile file(filename);
+    QByteArray certificate = getCertContent(filename);
+    QList<QSslCertificate> SslCertificateList = QSslCertificate::fromData(certificate, QSsl::Pem);
+    if ( !SslCertificateList.isEmpty() ){
+        QStringList subject = SslCertificateList[0].subjectInfo(QSslCertificate::CommonName);
+        QString modFileName = CERTS_PATH+subject[0]+".pem";
+        if(file.rename(modFileName.replace(" ", "_"))){
+            return file.fileName();
+        } else {
+            return "";
+        }
+    }
+    return "";
+}
+
+QString FileHandler::moveKeyFile(QString filename){
+    QDir keyPath(KEYS_PATH);
+    if (!keyPath.exists(KEYS_PATH)){
+        keyPath.mkpath(KEYS_PATH);
+    }
+    QFile file(filename);
+    file.open(QIODevice::ReadOnly);
+    QSslKey checkKey(file.readAll(),  QSsl::Rsa);
+    file.close();
+    if ( !checkKey.isNull() ){
+        QFileInfo fileInfo(file);
+        QString modFileName = KEYS_PATH + fileInfo.fileName().replace(" ", "_");
+        if(file.rename(modFileName)){
+            return file.fileName();
+        } else {
+            return "" ;
+        }
+    }
+    return "";
+}
+
+QString FileHandler::movePacFile(QString filename){
+    QDir keyPath(PACS_PATH);
+    if (!keyPath.exists(PACS_PATH)){
+        keyPath.mkpath(PACS_PATH);
+    }
+    QFile file(filename);
+    QFileInfo fileInfo(file);
+    QString modFileName = PACS_PATH + fileInfo.baseName().replace(" ", "_") + ".pac";
+    if(file.rename(modFileName)){
+        return file.fileName();
+    }
+    return "" ;
+}
+
+bool FileHandler::removeFile(QString filename){
+    QFile file(filename);
+    return file.remove();
+}
+
+struct CertificateListModel::Private {
+    QStringList data;
+};
+
+CertificateListModel::CertificateListModel(QObject *parent) : QAbstractListModel(parent) {
+    p = new CertificateListModel::Private();
+    QStringList nameFilter("*.pem");
+    QDir directory(CERTS_PATH);
+    QStringList files = directory.entryList(nameFilter);
+    files.sort(Qt::CaseInsensitive);
+    files.insert(0, _("None") );
+    files.append( _("Choose…") );
+    p->data = files;
+}
+
+CertificateListModel::~CertificateListModel() {
+    delete p;
+}
+
+QHash<int, QByteArray> CertificateListModel::roleNames() const {
+    QHash<int, QByteArray> roles;
+    roles[CNRole] = "CommonName";
+    roles[ORole] = "Organization";
+    roles[expDateRole] = "expiryDate";
+
+    //roles[certFileNameRole] = "certFileName";
+    //...more if needed see QSslCertificate::SubjectInfo
+    return roles;
+}
+
+int CertificateListModel::rowCount(const QModelIndex &/*parent*/) const {
+    return p->data.size();
+}
+
+QString CertificateListModel::getfileName(const int selectedIndex) const {
+    return CERTS_PATH + p->data[selectedIndex];
+}
+
+void CertificateListModel::dataupdate(){
+    beginResetModel();
+    p->data.clear();
+    QStringList nameFilter("*.pem");
+    QDir directory(CERTS_PATH);
+    QStringList files = directory.entryList(nameFilter);
+    files.sort(Qt::CaseInsensitive);
+    files.insert(0, _("None") );
+    files.append( _("Choose…") );
+    p->data = files;
+    endResetModel();
+}
+
+QVariant CertificateListModel::data(const QModelIndex &index, int role) const {
+    if(!index.isValid() || index.row() >= ( p->data.size()) ) {
+        return QVariant();
+    } else if (index.row() == 0){
+        const QString &row0 = p->data[index.row()];
+
+        switch(role) {
+        case CNRole : return row0;
+        case ORole : return "";
+        case expDateRole : return "";
+
+        }
+    } else if (index.row() == p->data.size()-1){
+        const QString &rowend = p->data[index.row()];
+
+        switch(role) {
+        case CNRole : return rowend;
+        case ORole : return "";
+        case expDateRole : return "";
+        }
+    }
+
+    const QString &row = CERTS_PATH+p->data[index.row()];
+    QList<QSslCertificate> certificate = QSslCertificate::fromPath(row, QSsl::Pem, QRegExp::Wildcard);
+
+    switch(role) {
+
+    case CNRole : return certificate[0].subjectInfo(QSslCertificate::CommonName)[0];
+    case ORole : return certificate[0].subjectInfo(QSslCertificate::Organization)[0];
+    case expDateRole : return certificate[0].expiryDate().toString("dd.MM.yyyy");
+
+    default : return QVariant();
+    }
+}
+
+/***************************************/
+
+struct PrivatekeyListModel::Private {
+    QStringList data;
+};
+
+PrivatekeyListModel::PrivatekeyListModel(QObject *parent) : QAbstractListModel(parent) {
+    p = new PrivatekeyListModel::Private();
+    QDir directory(KEYS_PATH);
+    QStringList files = directory.entryList(QDir::Files, QDir::Name);
+    files.sort(Qt::CaseInsensitive);
+    files.insert(0, _("None") );
+    files.append( _("Choose…") );
+    p->data = files;
+}
+
+PrivatekeyListModel::~PrivatekeyListModel() {
+    delete p;
+}
+
+QHash<int, QByteArray> PrivatekeyListModel::roleNames() const {
+    QHash<int, QByteArray> roles;
+    roles[keyName] = "KeyName";
+    roles[keyType] = "KeyType";
+    roles[keyAlgorithm] = "KeyAlgorithm";
+    roles[keyLength] = "KeyLength";
+    return roles;
+}
+
+int PrivatekeyListModel::rowCount(const QModelIndex &/*parent*/) const {
+    return p->data.size();
+}
+
+QString PrivatekeyListModel::getfileName(const int selectedIndex) const {
+    return  KEYS_PATH + p->data[selectedIndex];
+}
+
+void PrivatekeyListModel::dataupdate(){
+    beginResetModel();
+    p->data.clear();
+    QDir directory(KEYS_PATH);
+    QStringList files = directory.entryList(QDir::Files, QDir::Name);
+    files.sort(Qt::CaseInsensitive);
+    files.insert(0, _("None") );
+    files.append( _("Choose…") );
+    p->data = files;
+    endResetModel();
+}
+
+QVariant PrivatekeyListModel::data(const QModelIndex &index, int role) const {
+    if(!index.isValid() || index.row() >= ( p->data.size()) ) {
+        return QVariant();
+    } else if (index.row() == 0){
+        const QString &row0 = p->data[index.row()];
+
+        switch(role) {
+        case keyName : return row0; // returns "None"
+        case keyType : return "";
+        case keyAlgorithm : return "";
+        case keyLength : return "";
+        }
+    } else if (index.row() == p->data.size()-1){
+        const QString &rowend = p->data[index.row()];
+
+        switch(role) {
+        case keyName : return rowend; // returns "Choose file...
+        case keyType : return "";
+        case keyAlgorithm : return "";
+        case keyLength : return "";
+        }
+    }
+
+    const QString &row = KEYS_PATH+p->data[index.row()];
+    QFile keyFile(row);
+    keyFile.open(QIODevice::ReadOnly);
+    QSslKey privateKey( keyFile.readAll(),  QSsl::Rsa );
+    QString type;
+    if (privateKey.type() == 0){ type = _("Private key");}
+    else { type = _("Public key"); }
+
+    QString algorithm;
+    if (privateKey.algorithm() == 1) { algorithm = "RSA";}
+    else if (privateKey.algorithm() == 2){ algorithm = "DSA";}
+    else { algorithm = _("Opaque");}
+
+    QFileInfo keyFileInfo(keyFile);
+    switch(role) {
+
+    case keyName : return keyFileInfo.fileName();
+    case keyType : return type;
+    case keyAlgorithm : return algorithm;
+    case keyLength : return privateKey.length();
+
+    default : return QVariant();
+    }
+}
+
+/***************************************/
+
+struct PacFileListModel::Private {
+    QStringList data;
+};
+
+PacFileListModel::PacFileListModel(QObject *parent) : QAbstractListModel(parent) {
+    p = new PacFileListModel::Private();
+    QDir directory(PACS_PATH);
+    QStringList files = directory.entryList(QDir::Files, QDir::Name);
+    files.sort(Qt::CaseInsensitive);
+    files.insert(0, _("None") );
+    files.append( _("Choose…") );
+    p->data = files;
+}
+
+PacFileListModel::~PacFileListModel() {
+    delete p;
+}
+
+QHash<int, QByteArray> PacFileListModel::roleNames() const {
+    QHash<int, QByteArray> roles;
+    roles[pacFileName] = "pacFileName";
+    return roles;
+}
+
+int PacFileListModel::rowCount(const QModelIndex &/*parent*/) const {
+    return p->data.size();
+}
+
+QString PacFileListModel::getfileName(const int selectedIndex) const {
+    return  PACS_PATH + p->data[selectedIndex];
+}
+
+void PacFileListModel::dataupdate(){
+    beginResetModel();
+    p->data.clear();
+    QDir directory(PACS_PATH);
+    QStringList files = directory.entryList(QDir::Files, QDir::Name);
+    files.sort(Qt::CaseInsensitive);
+    files.insert(0, _("None") );
+    files.append( _("Choose…") );
+    p->data = files;
+    endResetModel();
+}
+
+QVariant PacFileListModel::data(const QModelIndex &index, int role) const {
+    if(!index.isValid() || index.row() >= ( p->data.size()) ) {
+        return QVariant();
+    } else if (index.row() == 0){
+        const QString &row0 = p->data[index.row()];
+
+        switch(role) {
+        case pacFileName : return row0; // returns "None"
+        }
+    } else if (index.row() == p->data.size()-1){
+        const QString &rowend = p->data[index.row()];
+
+        switch(role) {
+        case pacFileName : return rowend; // returns "Choose file...
+        }
+    }
+
+    const QString &name = p->data[index.row()];
+    switch(role) {
+
+    case pacFileName : return name;
+
+    default : return QVariant();
+    }
+}

=== added file 'plugins/wifi/certhandler.h'
--- plugins/wifi/certhandler.h	1970-01-01 00:00:00 +0000
+++ plugins/wifi/certhandler.h	2015-07-01 18:56:14 +0000
@@ -0,0 +1,98 @@
+#ifndef CERTHANDLER_H
+#define CERTHANDLER_H
+
+#include <QtQml>
+#include <QtQml/QQmlContext>
+#include <QObject>
+#include <QAbstractListModel>
+
+class FileHandler : public QObject
+{
+    Q_OBJECT
+public:
+    Q_INVOKABLE QByteArray getCertContent(QString filename);
+    Q_INVOKABLE QString moveCertFile(QString filename);
+    Q_INVOKABLE QString moveKeyFile(QString filename);
+    Q_INVOKABLE QString movePacFile(QString filename);
+    Q_INVOKABLE bool removeFile(QString filename);
+};
+
+
+
+class CertificateListModel : public QAbstractListModel
+{
+    Q_OBJECT
+
+public:
+    enum CertificateListRoles {
+        CNRole = Qt::UserRole + 1,
+        ORole,
+        expDateRole,
+        //certFileNameRole,
+    };
+
+    explicit CertificateListModel(QObject *parent = 0);
+    ~CertificateListModel();
+    QHash<int, QByteArray> roleNames() const;
+    Q_INVOKABLE int rowCount(const QModelIndex &parent = QModelIndex()) const;
+    Q_INVOKABLE QString  getfileName(const int selectedIndex) const;
+    Q_INVOKABLE void dataupdate();
+    QVariant data(const QModelIndex &index, int role) const;
+
+private:
+    struct Private;
+    Private *p;
+
+};
+
+class PrivatekeyListModel : public QAbstractListModel
+{
+    Q_OBJECT
+
+public:
+    enum PrivatekeyListRoles {
+        keyName = Qt::UserRole + 1,
+        keyType,
+        keyAlgorithm,
+        keyLength,
+    };
+
+    explicit PrivatekeyListModel(QObject *parent = 0);
+    ~PrivatekeyListModel();
+    QHash<int, QByteArray> roleNames() const;
+    Q_INVOKABLE int rowCount(const QModelIndex &parent = QModelIndex()) const;
+    Q_INVOKABLE QString  getfileName(const int selectedIndex) const;
+    Q_INVOKABLE void dataupdate();
+    QVariant data(const QModelIndex &index, int role) const;
+private:
+    struct Private;
+    Private *p;
+
+};
+
+class PacFileListModel : public QAbstractListModel
+{
+    Q_OBJECT
+
+public:
+    enum PacFileListRoles {
+        pacFileName = Qt::UserRole + 1,
+
+    };
+
+    explicit PacFileListModel(QObject *parent = 0);
+    ~PacFileListModel();
+    QHash<int, QByteArray> roleNames() const;
+    Q_INVOKABLE int rowCount(const QModelIndex &parent = QModelIndex()) const;
+    Q_INVOKABLE QString  getfileName(const int selectedIndex) const;
+    Q_INVOKABLE void dataupdate();
+    QVariant data(const QModelIndex &index, int role) const;
+private:
+    struct Private;
+    Private *p;
+
+};
+
+
+#endif // CERTHANDLER_H
+

=== modified file 'plugins/wifi/plugin.cpp'
--- plugins/wifi/plugin.cpp	2014-07-23 13:53:48 +0000
+++ plugins/wifi/plugin.cpp	2015-07-01 18:56:14 +0000
@@ -22,6 +22,7 @@
 #include "unitymenumodelstack.h"
 #include "wifidbushelper.h"
 #include "previousnetworkmodel.h"
+#include "certhandler.h"
 
 namespace {
 
@@ -45,6 +46,10 @@
     qmlRegisterType<UnityMenuModelStack>(uri, 1, 0, "UnityMenuModelStack");
     qmlRegisterSingletonType<WifiDbusHelper>(uri, 1, 0, "DbusHelper", dbusProvider);
     qmlRegisterType<PreviousNetworkModel>(uri, 1, 0, "PreviousNetworkModel");
+    qmlRegisterType<CertificateListModel>(uri, 1, 0, "CertificateListModel");
+    qmlRegisterType<PrivatekeyListModel>(uri, 1, 0, "PrivatekeyListModel");
+    qmlRegisterType<PacFileListModel>(uri, 1, 0, "PacFileListModel");
+    qmlRegisterType<FileHandler>(uri, 1, 0, "FileHandler");
 }
 
 void BackendPlugin::initializeEngine(QQmlEngine *engine, const char *uri)

=== modified file 'plugins/wifi/wifidbushelper.cpp'
--- plugins/wifi/wifidbushelper.cpp	2015-04-07 20:45:40 +0000
+++ plugins/wifi/wifidbushelper.cpp	2015-07-01 18:56:14 +0000
@@ -40,14 +40,14 @@
 Q_DECLARE_METATYPE(ConfigurationData)
 
 WifiDbusHelper::WifiDbusHelper(QObject *parent) : QObject(parent),
-      m_systemBusConnection(QDBusConnection::systemBus())
+    m_systemBusConnection(QDBusConnection::systemBus())
 {
     qDBusRegisterMetaType<ConfigurationData>();
 }
 
-void WifiDbusHelper::connect(QString ssid, int security, QString password)
+void WifiDbusHelper::connect(QString ssid, int security, int auth, QStringList usernames, QStringList password, QStringList certs, int p2auth)
 {
-    if(security<0 || security>2) {
+    if((security<0 || security>5) || (auth<0 || auth>4) || (p2auth<0 || p2auth>5)) {
         qWarning() << "Qml and C++ have gotten out of sync. Can't connect.\n";
         return;
     }
@@ -68,26 +68,116 @@
     // security:
     // 0: None
     // 1: WPA & WPA2 Personal
-    // 2: WEP
-    if (security != 0) {
+    // 2: WPA Enterprise
+    // 3: WEP
+    // 4: Dynamic WEP
+    // 5: LEAP
+    if (security != 0) { // WPA Enterprise or Dynamic WEP
         wireless["security"] = QStringLiteral("802-11-wireless-security");
 
         QVariantMap wireless_security;
 
         if (security == 1) {
             wireless_security["key-mgmt"] = QStringLiteral("wpa-psk");
-            wireless_security["psk"] = password;
-        } else if (security == 2) {
+            wireless_security["psk"] = password[0];
+        } else if (security == 3) {
             wireless_security["key-mgmt"] = QStringLiteral("none");
             wireless_security["auth-alg"] = QStringLiteral("open");
-            wireless_security["wep-key0"] = password;
+            wireless_security["wep-key0"] = password[0];
             wireless_security["wep-key-type"] = QVariant(uint(1));
+        } else if (security == 2) {
+            wireless_security["key-mgmt"] = QStringLiteral("wpa-eap");
+        } else if (security == 4) {
+            wireless_security["key-mgmt"] = QStringLiteral("ieee8021x");
+            /* leave disabled as hopefully not needed:
+            QStringList wep_pairwise, wep_group;
+            wep_pairwise[0] ="wep40"; wep_pairwise[1] ="wep104";
+            wep_group[0] ="wep40"; wep_group[1] ="wep104";
+            wireless_security["pairwise"] = wep_pairwise;
+            wireless_security["group"] = wep_group; */
+        } else if (security == 5) {
+            wireless_security["key-mgmt"] = QStringLiteral("ieee8021x");
+            wireless_security["auth-alg"] = QStringLiteral("leap");
+            wireless_security["leap-username"] = usernames[0];
+            wireless_security["leap-password"] = password[0];
         }
         configuration["802-11-wireless-security"] = wireless_security;
     }
 
     configuration["802-11-wireless"] = wireless;
 
+    if (security == 2 || security == 4){
+
+        QVariantMap wireless_802_1x;
+        // [802-1x]
+        /*TLS   // index: 0
+          TTLS  // index: 1
+          LEAP  // index: 2
+          FAST  // index: 3
+          PEAP  // index: 4 */
+        wireless_802_1x["identity"] = usernames[0];
+        if (auth != 0) {
+            wireless_802_1x["password"] = password[0];
+        }
+
+        QByteArray cacert(    "file://" + certs[0].toUtf8() + '\0');
+        QByteArray clientcert("file://" + certs[1].toUtf8() + '\0');
+        QByteArray privatekey("file://" + certs[2].toUtf8() + '\0');
+        QString pacFile( certs[3] );
+
+        if (auth == 0) { // TLS
+            wireless_802_1x["eap"] = QStringList("tls");
+            if (certs[0] != "") {wireless_802_1x["ca-cert"] = cacert;}
+            if (certs[1] != "") {wireless_802_1x["client-cert"] = clientcert;}
+            if (certs[2] != "") {wireless_802_1x["private-key"] = privatekey;}
+            wireless_802_1x["private-key-password"] = password[0];
+        } else if (auth == 1) { // TTLS
+            wireless_802_1x["eap"] = QStringList("ttls");
+            if (certs[0] != "") {wireless_802_1x["ca-cert"] = cacert;}
+            if (usernames[1] != "") {wireless_802_1x["anonymous-identity"]  = usernames[1];}
+            if (password[1] == "false") {wireless_802_1x["password-flags"]  = uint(2);}
+        } else if (auth == 2) { // LEAP
+            wireless_802_1x["eap"] = QStringList("leap");
+        } else if (auth == 3) { // FAST
+            wireless_802_1x["eap"] = QStringList("fast");
+            if (certs[0] != "") {wireless_802_1x["ca-cert"] = cacert;}
+            if (usernames[1] != "") {wireless_802_1x["anonymous-identity"]  = usernames[1];}
+            if (password[1] == "false") {wireless_802_1x["password-flags"]  = uint(2);}
+            if (certs[3] != "" ) {wireless_802_1x["pac-file"]  = pacFile;}
+            wireless_802_1x["phase1-fast-provisioning"] = certs[4];
+        } else if (auth == 4) { // PEAP
+            wireless_802_1x["eap"] = QStringList("peap");
+            if (certs[0] != "") {wireless_802_1x["ca-cert"] = cacert;}
+            if (usernames[1] != "") {wireless_802_1x["anonymous-identity"]  = usernames[1];}
+            if (password[1] == "false") {wireless_802_1x["password-flags"]  = uint(2);}
+            if (certs[5] != "2") {wireless_802_1x["phase1-peapver"] = certs[5]; }
+            // wireless_802_1x["phase1-peaplabel"] = QString("1"); #jkb:let us unset this until problems are reported.
+        }
+
+        if (auth == 1 || auth == 3 || auth == 4 ){ // only for TTLS, FAST and PEAP
+            /* PAP      // index: 0
+               MSCHAPv2 // index: 1
+               MSCHAP   // index: 2
+               CHAP     // index: 3
+               GTC      // index: 4
+               MD5      // index: 5 */
+            if (p2auth == 0) {
+                wireless_802_1x["phase2-auth"] = QStringLiteral("pap");
+            } else if (p2auth == 1) {
+                wireless_802_1x["phase2-auth"] = QStringLiteral("mschapv2");
+            } else if (p2auth == 2) {
+                wireless_802_1x["phase2-auth"] = QStringLiteral("mschap");
+            } else if (p2auth == 3) {
+                wireless_802_1x["phase2-auth"] = QStringLiteral("chap");
+            } else if (p2auth == 4) {
+                wireless_802_1x["phase2-auth"] = QStringLiteral("gtc");
+            } else if (p2auth == 5) {
+                wireless_802_1x["phase2-auth"] = QStringLiteral("md5");
+            }
+        }
+        configuration["802-1x"] = wireless_802_1x;
+    }
+
     // find the first wlan adapter for now
     auto reply1 = mgr.GetDevices();
     reply1.waitForFinished();
@@ -184,9 +274,10 @@
     }
 }
 
+
 void WifiDbusHelper::nmDeviceStateChanged(uint newState,
-                                           uint oldState,
-                                           uint reason)
+                                         uint oldState,
+                                         uint reason)
 {
     Q_UNUSED (oldState);
     Q_EMIT (deviceStateChanged(newState, reason));
@@ -329,15 +420,22 @@
         // If the connection has never been activated succesfully there is a
         // high chance that it has no stored secrects.
         if (timestamp != 0) {
-            auto reply = m_iface.GetSecrets("802-11-wireless-security");
+
+            QString secretsType;
+            if (keymgmt == "wpa-psk" && authalg == "open") {
+                secretsType = "802-11-wireless-security";
+            } else if (keymgmt == "wpa-eap" || keymgmt == "ieee8021x") {
+                secretsType = "802-1x";
+            }
+
+            auto reply = m_iface.GetSecrets( secretsType );
             reply.waitForFinished();
             if(!reply.isValid()) {
                 qWarning() << "Error querying secrects: " << reply.error().message() << "\n";
                 return;
             }
             auto secrects = reply.value();
-
-            auto match = secrects.find("802-11-wireless-security");
+            auto match = secrects.find( secretsType );
             if (match != secrects.end()) {
                 auto secrects_security = *match;
 
@@ -345,6 +443,8 @@
                     password = secrects_security["wep-key0"].toString();
                 } else if (keymgmt == "wpa-psk" && authalg == "open") {
                     password = secrects_security["psk"].toString();
+                } else if (keymgmt == "wpa-eap" || keymgmt == "ieee8021x") {
+                    password = secrects_security["password"].toString();
                 } else {
                 }
             }
@@ -390,7 +490,7 @@
 QList<QStringList> WifiDbusHelper::getPreviouslyConnectedWifiNetworks() {
     QList<QStringList> networks;
 
-   OrgFreedesktopNetworkManagerSettingsInterface foo
+    OrgFreedesktopNetworkManagerSettingsInterface foo
             (NM_SERVICE,
              "/org/freedesktop/NetworkManager/Settings",
              QDBusConnection::systemBus());
@@ -464,7 +564,7 @@
                 auto ac_path_var = iface.property("ActiveConnection");
                 if(!ac_path_var.isValid()) {
                     qWarning() << __PRETTY_FUNCTION__ << ": Could not get active connection property from "
-                            << d.path() << ".\n";
+                               << d.path() << ".\n";
                     return true;
                 }
                 QString ac_path = ac_path_var.value<QDBusObjectPath>().path();
@@ -472,7 +572,7 @@
                 auto conn_path_var = ac_iface.property("Connection");
                 if(!conn_path_var.isValid()) {
                     qWarning() << __PRETTY_FUNCTION__ << ": Could not get connection path property from "
-                            << ac_path << ".\n";
+                               << ac_path << ".\n";
                     return false;
                 }
                 forgetConnection(conn_path_var.value<QDBusObjectPath>().path());

=== modified file 'plugins/wifi/wifidbushelper.h'
--- plugins/wifi/wifidbushelper.h	2014-10-10 14:10:52 +0000
+++ plugins/wifi/wifidbushelper.h	2015-07-01 18:56:14 +0000
@@ -37,7 +37,7 @@
     explicit WifiDbusHelper(QObject *parent = nullptr);
     ~WifiDbusHelper() {};
 
-    Q_INVOKABLE void connect(QString ssid, int security, QString password);
+    Q_INVOKABLE void connect(QString ssid, int security, int auth, QStringList usernames, QStringList password, QStringList certs, int p2auth);
     Q_INVOKABLE QList<QStringList> getPreviouslyConnectedWifiNetworks();
     Q_INVOKABLE void forgetConnection(const QString dbus_path);
     Q_INVOKABLE bool forgetActiveDevice();

=== modified file 'tests/autopilot/ubuntu_system_settings/__init__.py'
--- tests/autopilot/ubuntu_system_settings/__init__.py	2015-05-28 14:09:07 +0000
+++ tests/autopilot/ubuntu_system_settings/__init__.py	2015-07-01 18:56:14 +0000
@@ -978,15 +978,23 @@
 
     """
     @autopilot.logging.log_action(logger.debug)
-    def connect_to_hidden_network(self, name, security="none", password=None,
-                                  cancel=False, scroll_to_and_click=None):
-        dialog = self._click_connect_to_hidden_network(scroll_to_and_click)
+    def connect_to_hidden_network(self, name, security='none', username=None,
+                                  password=None, auth=None, protocol=None,
+                                  cancel=False):
+        dialog = self._click_connect_to_hidden_network()
+        dialog._scroll_to_and_click = self._scroll_to_and_click
         dialog.enter_name(name)
+
         if security:
             dialog.set_security(security)
+        if auth:
+            dialog.set_auth(auth)
+        if protocol:
+            dialog.set_protocol(protocol)
+        if username:
+            dialog.enter_username(username)
         if password:
             dialog.enter_password(password)
-
         if cancel:
             dialog.cancel()
             return self
@@ -995,7 +1003,7 @@
             return dialog
 
     @autopilot.logging.log_action(logger.debug)
-    def _click_connect_to_hidden_network(self, scroll_to_and_click):
+    def _click_connect_to_hidden_network(self):
 
         # we can't mock the qunitymenu items, so we
         # have to wait for them to be built
@@ -1003,16 +1011,13 @@
 
         button = self.select_single('*',
                                     objectName='connectToHiddenNetwork')
-        if (scroll_to_and_click):
-            scroll_to_and_click(button)
-        else:
-            self.pointing_device.click_object(button)
+        self._scroll_to_and_click(button)
         return self.get_root_instance().wait_select_single(
             objectName='otherNetworkDialog')
 
     @autopilot.logging.log_action(logger.debug)
-    def go_to_previous_networks(self, scroll_to_and_click=None):
-        return self._click_previous_network(scroll_to_and_click)
+    def go_to_previous_networks(self):
+        return self._click_previous_network()
 
     """Removes previous network
 
@@ -1022,14 +1027,14 @@
 
     """
     @autopilot.logging.log_action(logger.debug)
-    def remove_previous_network(self, ssid, scroll_to_and_click=None):
-        page = self.go_to_previous_networks(scroll_to_and_click)
+    def remove_previous_network(self, ssid):
+        page = self.go_to_previous_networks()
         details = page.select_network(ssid)
         details.forget_network()
         return page
 
     @autopilot.logging.log_action(logger.debug)
-    def _click_previous_network(self, scroll_to_and_click):
+    def _click_previous_network(self):
 
         # we can't mock the qunitymenu items, so we
         # have to wait for them to be built
@@ -1037,10 +1042,7 @@
 
         button = self.select_single('*',
                                     objectName='previousNetwork')
-        if (scroll_to_and_click):
-            scroll_to_and_click(button)
-        else:
-            self.pointing_device.click_object(button)
+        self._scroll_to_and_click(button)
         return self.get_root_instance().wait_select_single(
             objectName='previousNetworksPage')
 
@@ -1058,6 +1060,18 @@
                 return True
         return False
 
+    # FIXME: Use ListItem methods instead.
+    @autopilot.logging.log_action(logger.debug)
+    def _expand_list(self, list_name):
+        item_list = self.select_single(
+            '*', objectName=list_name)
+        active_child = item_list.select_single(
+            '*', objectName='listContainer')
+        self._scroll_to_and_click(active_child)
+        # wait for it to expand
+        sleep(0.5)
+        return item_list
+
     @autopilot.logging.log_action(logger.debug)
     def enter_name(self, name):
         self._enter_name(name)
@@ -1066,16 +1080,27 @@
     def _enter_name(self, name):
         namefield = self.select_single('TextField',
                                        objectName='networkname')
+        self._scroll_to_and_click(namefield)
         namefield.write(name)
 
     @autopilot.logging.log_action(logger.debug)
+    def enter_username(self, username):
+        self._enter_username(username)
+
+    @autopilot.logging.log_action(logger.debug)
+    def _enter_username(self, username):
+        namefield = self.select_single('TextField',
+                                       objectName='username')
+        self._scroll_to_and_click(namefield)
+        namefield.write(username)
+
+    @autopilot.logging.log_action(logger.debug)
     def set_security(self, security):
         """Sets the hidden network's security
 
-        :param security: Either "none", "wpa" or "wep
+        :param security: Either 'none', 'wpa', 'wep', 'wpa-ep', 'dewp', 'leap'
 
         :returns: None
-
         """
 
         # We only set security if not none, since none is default
@@ -1083,35 +1108,28 @@
             self._set_security(security)
 
     @autopilot.logging.log_action(logger.debug)
-    def _expand_security_list(self):
-        sec_list = self.select_single(
-            '*', objectName='securityList')
-        active_child = sec_list.select_single(
-            '*', objectName='listContainer')
-        self.pointing_device.click_object(active_child)
-        # wait for it to expand
-        sleep(0.5)
-        return sec_list
-
-    @autopilot.logging.log_action(logger.debug)
     def _set_security(self, security):
+        s_list = self._expand_list('securityList')
+        item = None
         if security == 'none':
-            sec_list = self._expand_security_list()
-            item = sec_list.wait_select_single('*',
-                                               text=_('None'))
-            self.pointing_device.click_object(item)
+            item = s_list.wait_select_single('*', text=_('None'))
         elif security == 'wpa':
-            sec_list = self._expand_security_list()
-            item = sec_list.wait_select_single('*',
-                                               text=_('WPA & WPA2 Personal'))
-            self.pointing_device.click_object(item)
+            item = s_list.wait_select_single('*',
+                                             text=_('WPA & WPA2 Personal'))
         elif security == 'wep':
-            sec_list = self._expand_security_list()
-            item = sec_list.wait_select_single('*',
-                                               text=_('WEP'))
-            self.pointing_device.click_object(item)
+            item = s_list.wait_select_single('*', text=_('WEP'))
+        elif security == 'wpa-ep':
+            item = s_list.wait_select_single('*',
+                                             text=_('WPA & WPA2 Enterprise'))
+        elif security == 'dwep':
+            item = s_list.wait_select_single('*',
+                                             text=_('Dynamic WEP (802.1x)'))
+        elif security == 'leap':
+            item = s_list.wait_select_single('*', text=_('LEAP'))
         elif security is not None:
             raise ValueError('security type %s is not valid' % security)
+
+        self.pointing_device.click_object(item)
         # wait for ui to change
         sleep(0.5)
 
@@ -1123,16 +1141,78 @@
     def _enter_password(self, password):
         pwdfield = self.select_single('TextField',
                                       objectName='password')
+        self._scroll_to_and_click(pwdfield)
         pwdfield.write(password)
 
     @autopilot.logging.log_action(logger.debug)
+    def set_protocol(self, protocol):
+        """Sets the hidden network's protocol.
+
+        :param protocol: Either 'pap', 'mschapv2', 'mschap', 'chap', 'gtc',
+                         or 'md5'.
+        """
+        self._set_protocol(protocol)
+
+    @autopilot.logging.log_action(logger.debug)
+    def _set_protocol(self, protocol):
+        p_list = self._expand_list('p2authList')
+        item = None
+        if protocol == 'pap':
+            item = p_list.wait_select_single(text='PAP')
+        elif protocol == 'mschapv2':
+            item = p_list.wait_select_single(text='MSCHAPv2')
+        elif protocol == 'mschap':
+            item = p_list.wait_select_single(text='MSCHAP')
+        elif protocol == 'chap':
+            item = p_list.wait_select_single(text='CHAP')
+        elif protocol == 'gtc':
+            item = p_list.wait_select_single(text='GTC')
+        elif protocol == 'md5':
+            item = p_list.wait_select_single(text='MD5')
+        elif protocol is not None:
+            raise ValueError('protocol type %s is not valid' % protocol)
+
+        self.pointing_device.click_object(item)
+        # wait for ui to change
+        sleep(0.5)
+
+    @autopilot.logging.log_action(logger.debug)
+    def set_auth(self, auth):
+        """Sets the hidden network's protocol.
+
+        :param auth: Either 'tls', 'ttls', 'leap', 'fast' or 'peap'.
+        """
+        self._set_auth(auth)
+
+    @autopilot.logging.log_action(logger.debug)
+    def _set_auth(self, auth):
+        a_list = self._expand_list('authList')
+        item = None
+        if auth == 'tls':
+            item = a_list.wait_select_single(text='TLS')
+        elif auth == 'ttls':
+            item = a_list.wait_select_single(text='TTLS')
+        elif auth == 'leap':
+            item = a_list.wait_select_single(text='LEAP')
+        elif auth == 'fast':
+            item = a_list.wait_select_single(text='FAST')
+        elif auth == 'peap':
+            item = a_list.wait_select_single(text='PEAP')
+        elif auth is not None:
+            raise ValueError('auth type %s is not valid' % auth)
+
+        self.pointing_device.click_object(item)
+        # wait for ui to change
+        sleep(0.5)
+
+    @autopilot.logging.log_action(logger.debug)
     def cancel(self):
         self._click_cancel()
 
     @autopilot.logging.log_action(logger.debug)
     def _click_cancel(self):
         button = self.select_single('Button', objectName='cancel')
-        self.pointing_device.click_object(button)
+        self._scroll_to_and_click(button)
 
     @autopilot.logging.log_action(logger.debug)
     def connect(self):
@@ -1141,7 +1221,7 @@
     @autopilot.logging.log_action(logger.debug)
     def _click_connect(self):
         button = self.select_single('Button', objectName='connect')
-        self.pointing_device.click_object(button)
+        self._scroll_to_and_click(button)
 
 
 class PreviousNetworks(

=== modified file 'tests/autopilot/ubuntu_system_settings/tests/__init__.py'
--- tests/autopilot/ubuntu_system_settings/tests/__init__.py	2015-05-15 12:47:14 +0000
+++ tests/autopilot/ubuntu_system_settings/tests/__init__.py	2015-07-01 18:56:14 +0000
@@ -863,9 +863,9 @@
         cls.start_system_bus()
         cls.dbus_con = cls.get_dbus(True)
         # Add a mock NetworkManager environment so we get consistent results
+        template = os.path.join(os.path.dirname(__file__), 'networkmanager.py')
         (cls.p_mock, cls.obj_nm) = cls.spawn_server_template(
-            'networkmanager', stdout=subprocess.PIPE)
-        cls.dbusmock = dbus.Interface(cls.obj_nm, dbusmock.MOCK_IFACE)
+            template, stdout=subprocess.PIPE)
 
     def setUp(self, panel=None):
         self.obj_nm.Reset()
@@ -874,19 +874,28 @@
             NM_SERVICE, self.device_path),
             dbusmock.MOCK_IFACE)
 
-        self.ap_mock = self.create_access_point('test_ap', 'test_ap')
+        self.ap_mock = self.create_access_point(
+            'test_ap', 'test_ap',
+            security=NM80211ApSecurityFlags.NM_802_11_AP_SEC_KEY_MGMT_PSK
+        )
 
         super(WifiBaseTestCase, self).setUp()
         self.wifi_page = self.main_view.go_to_wifi_page()
 
-    def create_access_point(self, name, ssid, secured=True):
-
-        if secured:
-            security = NM80211ApSecurityFlags.NM_802_11_AP_SEC_KEY_MGMT_PSK
-        else:
+    def create_access_point(self, name, ssid, security=None):
+        """Creates access point.
+
+        :param name: Name of access point
+        :param ssid: SSID of access point
+        :param security: Either None, or a NM80211ApSecurityFlags
+
+        :returns: Access point
+
+        """
+        if security is None:
             security = NM80211ApSecurityFlags.NM_802_11_AP_SEC_NONE
 
-        return self.dbusmock.AddAccessPoint(
+        return self.obj_nm.AddAccessPoint(
             self.device_path, name, ssid, self.random_mac_address(),
             InfrastructureMode.NM_802_11_MODE_INFRA, 2425, 5400, 82, security)
 

=== added file 'tests/autopilot/ubuntu_system_settings/tests/networkmanager.py'
--- tests/autopilot/ubuntu_system_settings/tests/networkmanager.py	1970-01-01 00:00:00 +0000
+++ tests/autopilot/ubuntu_system_settings/tests/networkmanager.py	2015-07-01 18:56:14 +0000
@@ -0,0 +1,960 @@
+'''NetworkManager mock template
+
+This creates the expected methods and properties of the main
+org.freedesktop.NetworkManager object, but no devices. You can specify any
+property such as 'NetworkingEnabled', or 'WirelessEnabled' etc. in
+"parameters".
+'''
+
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU Lesser General Public License as published by the Free
+# Software Foundation; either version 3 of the License, or (at your option) any
+# later version.  See http://www.gnu.org/copyleft/lgpl.html for the full text
+# of the license.
+
+__author__ = 'Iftikhar Ahmad'
+__email__ = '[e-mail]'
+__copyright__ = '(c) 2012 Canonical Ltd.'
+__license__ = 'LGPL 3+'
+
+import dbus
+import uuid
+import binascii
+
+from dbusmock import MOCK_IFACE
+import dbusmock
+
+
+BUS_NAME = 'org.freedesktop.NetworkManager'
+MAIN_OBJ = '/org/freedesktop/NetworkManager'
+MAIN_IFACE = 'org.freedesktop.NetworkManager'
+SETTINGS_OBJ = '/org/freedesktop/NetworkManager/Settings'
+SETTINGS_IFACE = 'org.freedesktop.NetworkManager.Settings'
+DEVICE_IFACE = 'org.freedesktop.NetworkManager.Device'
+WIRELESS_DEVICE_IFACE = 'org.freedesktop.NetworkManager.Device.Wireless'
+ACCESS_POINT_IFACE = 'org.freedesktop.NetworkManager.AccessPoint'
+CSETTINGS_IFACE = 'org.freedesktop.NetworkManager.Settings.Connection'
+ACTIVE_CONNECTION_IFACE = 'org.freedesktop.NetworkManager.Connection.Active'
+ACTIVE_CONNECTION_PATH = '/org/freedesktop/NetworkManager/ActiveConnection/'
+SYSTEM_BUS = True
+
+
+class NMState:
+    '''Global state
+
+    As per https://developer.gnome.org/NetworkManager/unstable/spec.html
+    #type-NM_STATE
+    '''
+    NM_STATE_UNKNOWN = 0
+    NM_STATE_ASLEEP = 10
+    NM_STATE_DISCONNECTED = 20
+    NM_STATE_DISCONNECTING = 30
+    NM_STATE_CONNECTING = 40
+    NM_STATE_CONNECTED_LOCAL = 50
+    NM_STATE_CONNECTED_SITE = 60
+    NM_STATE_CONNECTED_GLOBAL = 70
+
+
+class NMConnectivityState:
+    '''Connectvity state
+
+    As per https://developer.gnome.org/NetworkManager/unstable/spec.html
+    #type-NM_CONNECTIVITY
+    '''
+    NM_CONNECTIVITY_UNKNOWN = 0
+    NM_CONNECTIVITY_NONE = 1
+    NM_CONNECTIVITY_PORTAL = 2
+    NM_CONNECTIVITY_LIMITED = 3
+    NM_CONNECTIVITY_FULL = 4
+
+
+class NMActiveConnectionState:
+    '''Active connection state
+
+    As per https://developer.gnome.org/NetworkManager/unstable/spec.html
+    #type-NM_ACTIVE_CONNECTION_STATE
+    '''
+    NM_ACTIVE_CONNECTION_STATE_UNKNOWN = 0
+    NM_ACTIVE_CONNECTION_STATE_ACTIVATING = 1
+    NM_ACTIVE_CONNECTION_STATE_ACTIVATED = 2
+    NM_ACTIVE_CONNECTION_STATE_DEACTIVATING = 3
+    NM_ACTIVE_CONNECTION_STATE_DEACTIVATED = 4
+
+
+class InfrastructureMode:
+    '''Infrastructure mode
+
+    As per https://developer.gnome.org/NetworkManager/unstable/spec.html
+    #type-NM_802_11_MODE
+    '''
+    NM_802_11_MODE_UNKNOWN = 0
+    NM_802_11_MODE_ADHOC = 1
+    NM_802_11_MODE_INFRA = 2
+    NM_802_11_MODE_AP = 3
+
+    NAME_MAP = {
+        NM_802_11_MODE_UNKNOWN: 'unknown',
+        NM_802_11_MODE_ADHOC: 'adhoc',
+        NM_802_11_MODE_INFRA: 'infrastructure',
+        NM_802_11_MODE_AP: 'access-point',
+    }
+
+
+class DeviceState:
+    '''Device states
+
+    As per https://developer.gnome.org/NetworkManager/unstable/spec.html
+    #type-NM_DEVICE_STATE
+    '''
+    UNKNOWN = 0
+    UNMANAGED = 10
+    UNAVAILABLE = 20
+    DISCONNECTED = 30
+    PREPARE = 40
+    CONFIG = 50
+    NEED_AUTH = 60
+    IP_CONFIG = 70
+    IP_CHECK = 80
+    SECONDARIES = 90
+    ACTIVATED = 100
+    DEACTIVATING = 110
+    FAILED = 120
+
+
+class NM80211ApSecurityFlags:
+    '''Security flags
+
+    As per https://developer.gnome.org/NetworkManager/unstable/spec.html
+    #type-NM_802_11_AP_SEC
+    '''
+    NM_802_11_AP_SEC_NONE = 0x00000000
+    NM_802_11_AP_SEC_PAIR_WEP40 = 0x00000001
+    NM_802_11_AP_SEC_PAIR_WEP104 = 0x00000002
+    NM_802_11_AP_SEC_PAIR_TKIP = 0x00000004
+    NM_802_11_AP_SEC_PAIR_CCMP = 0x00000008
+    NM_802_11_AP_SEC_GROUP_WEP40 = 0x00000010
+    NM_802_11_AP_SEC_GROUP_WEP104 = 0x00000020
+    NM_802_11_AP_SEC_GROUP_TKIP = 0x00000040
+    NM_802_11_AP_SEC_GROUP_CCMP = 0x00000080
+    NM_802_11_AP_SEC_KEY_MGMT_PSK = 0x00000100
+    NM_802_11_AP_SEC_KEY_MGMT_802_1X = 0x00000200
+
+    NAME_MAP = {
+        NM_802_11_AP_SEC_KEY_MGMT_PSK: {
+            'key-mgmt': 'wpa-psk',
+            'auth-alg': 'open'
+        },
+        NM_802_11_AP_SEC_KEY_MGMT_802_1X: {
+            'key-mgmt': 'wpa-eap'
+        },
+    }
+
+
+class NM80211ApFlags:
+    '''Device flags
+
+    As per https://developer.gnome.org/NetworkManager/unstable/spec.html
+    #type-NM_802_11_AP_FLAGS
+    '''
+    NM_802_11_AP_FLAGS_NONE = 0x00000000
+    NM_802_11_AP_FLAGS_PRIVACY = 0x00000001
+
+
+def activate_connection(self, conn, dev, ap):
+    name = ap.rsplit('/', 1)[1]
+    RemoveActiveConnection(self, dev, ACTIVE_CONNECTION_PATH + name)
+
+    state = dbus.UInt32(
+        NMActiveConnectionState.NM_ACTIVE_CONNECTION_STATE_ACTIVATED
+    )
+    active_conn = dbus.ObjectPath(
+        AddActiveConnection(self, [dev], conn, ap, name, state)
+    )
+
+    return active_conn
+
+
+def deactivate_connection(self, active_conn_path):
+    NM = dbusmock.get_object(MAIN_OBJ)
+
+    for dev_path in NM.GetDevices():
+        RemoveActiveConnection(self, dev_path, active_conn_path)
+
+
+def add_and_activate_connection(self, conn_conf, dev, ap):
+    name = ap.rsplit('/', 1)[1]
+    RemoveWifiConnection(
+        self, dev, '/org/freedesktop/NetworkManager/Settings/' + name
+    )
+
+    raw_ssid = ''.join(
+        [chr(byte) for byte in conn_conf["802-11-wireless"]["ssid"]]
+    )
+    wifi_conn = dbus.ObjectPath(
+        AddWiFiConnection(self, dev, name, raw_ssid, "", conn_conf)
+    )
+
+    active_conn = activate_connection(self, wifi_conn, dev, ap)
+
+    return (wifi_conn, active_conn)
+
+
+def load(mock, parameters):
+    mock.activate_connection = activate_connection
+    mock.deactivate_connection = deactivate_connection
+    mock.add_and_activate_connection = add_and_activate_connection
+    mock.AddMethods(MAIN_IFACE, [
+        (
+            'GetDevices', '', 'ao',
+            'ret = [k for k in objects.keys() if "/Devices" in k]'
+        ),
+        ('GetPermissions', '', 'a{ss}', 'ret = {}'),
+        ('state', '', 'u', "ret = self.Get('%s', 'State')" % MAIN_IFACE),
+        (
+            'CheckConnectivity', '', 'u',
+            "ret = self.Get('%s', 'Connectivity')" % MAIN_IFACE
+        ),
+        (
+            'ActivateConnection', 'ooo', 'o',
+            "ret = self.activate_connection(self, args[0], args[1], args[2])"
+        ),
+        (
+            'DeactivateConnection', 'o', '',
+            "self.deactivate_connection(self, args[0])"
+        ),
+        (
+            'AddAndActivateConnection', 'a{sa{sv}}oo', 'oo',
+            "ret = self.add_and_activate_connection(" +
+            "self, args[0], args[1], args[2])"
+        ),
+    ])
+
+    mock.AddProperties(
+        '',
+        {
+            'ActiveConnections': dbus.Array([], signature='o'),
+            'Devices': dbus.Array([], signature='o'),
+            'NetworkingEnabled': parameters.get('NetworkingEnabled', True),
+            'Connectivity': parameters.get(
+                'Connectivity',
+                dbus.UInt32(NMConnectivityState.NM_CONNECTIVITY_FULL)
+            ),
+            'State': parameters.get(
+                'State', dbus.UInt32(NMState.NM_STATE_CONNECTED_GLOBAL)
+            ),
+            'Startup': False,
+            'Version': parameters.get('Version', '0.9.6.0'),
+            'WimaxEnabled': parameters.get('WimaxEnabled', True),
+            'WimaxHardwareEnabled': parameters.get(
+                'WimaxHardwareEnabled', True
+            ),
+            'WirelessEnabled': parameters.get('WirelessEnabled', True),
+            'WirelessHardwareEnabled': parameters.get(
+                'WirelessHardwareEnabled', True
+            ),
+            'WwanEnabled': parameters.get('WwanEnabled', False),
+            'WwanHardwareEnabled': parameters.get('WwanHardwareEnabled', True)
+        }
+    )
+
+    settings_props = {'Hostname': 'hostname',
+                      'CanModify': True,
+                      'Connections': dbus.Array([], signature='o')}
+    settings_methods = [
+        (
+            'ListConnections', '', 'ao',
+            "ret = self.Get('%s', 'Connections')" % SETTINGS_IFACE
+        ),
+        ('GetConnectionByUuid', 's', 'o', ''),
+        (
+            'AddConnection', 'a{sa{sv}}', 'o',
+            'ret = self.SettingsAddConnection(args[0])'
+        ),
+        ('SaveHostname', 's', '', '')
+    ]
+    mock.AddObject(SETTINGS_OBJ,
+                   SETTINGS_IFACE,
+                   settings_props,
+                   settings_methods)
+
+
[e-mail](MOCK_IFACE,
+                     in_signature='sssv', out_signature='')
+def SetProperty(self, path, iface, name, value):
+    obj = dbusmock.get_object(path)
+    obj.Set(iface, name, value)
+    obj.EmitSignal(iface, 'PropertiesChanged', 'a{sv}', [{name: value}])
+
+
[e-mail](MOCK_IFACE,
+                     in_signature='u', out_signature='')
+def SetGlobalConnectionState(self, state):
+    self.SetProperty(
+        MAIN_OBJ, MAIN_IFACE, 'State',
+        dbus.UInt32(state, variant_level=1)
+    )
+    self.EmitSignal(MAIN_IFACE, 'StateChanged', 'u', [state])
+
+
[e-mail](MOCK_IFACE,
+                     in_signature='u', out_signature='')
+def SetConnectivity(self, connectivity):
+    self.SetProperty(
+        MAIN_OBJ, MAIN_IFACE, 'Connectivity',
+        dbus.UInt32(connectivity, variant_level=1)
+    )
+
+
[e-mail](MOCK_IFACE,
+                     in_signature='ss', out_signature='')
+def SetDeviceActive(self, device_path, active_connection_path):
+    dev_obj = dbusmock.get_object(device_path)
+    dev_obj.Set(
+        DEVICE_IFACE, 'ActiveConnection',
+        dbus.ObjectPath(active_connection_path)
+    )
+    old_state = dev_obj.Get(DEVICE_IFACE, 'State')
+    dev_obj.Set(DEVICE_IFACE, 'State', dbus.UInt32(DeviceState.ACTIVATED))
+
+    dev_obj.EmitSignal(
+        DEVICE_IFACE, 'StateChanged', 'uuu',
+        [
+            dbus.UInt32(DeviceState.ACTIVATED),
+            old_state,
+            dbus.UInt32(1)
+        ]
+    )
+
+
[e-mail](MOCK_IFACE,
+                     in_signature='s', out_signature='')
+def SetDeviceDisconnected(self, device_path):
+    dev_obj = dbusmock.get_object(device_path)
+    dev_obj.Set(DEVICE_IFACE, 'ActiveConnection', dbus.ObjectPath('/'))
+    old_state = dev_obj.Get(DEVICE_IFACE, 'State')
+    dev_obj.Set(DEVICE_IFACE, 'State', dbus.UInt32(DeviceState.DISCONNECTED))
+
+    dev_obj.EmitSignal(
+        DEVICE_IFACE, 'StateChanged', 'uuu',
+        [
+            dbus.UInt32(DeviceState.DISCONNECTED),
+            old_state,
+            dbus.UInt32(1)
+        ]
+    )
+
+
[e-mail](MOCK_IFACE,
+                     in_signature='ssi', out_signature='s')
+def AddEthernetDevice(self, device_name, iface_name, state):
+    '''Add an ethernet device.
+
+    You have to specify device_name, device interface name (e. g. eth0), and
+    state. You can use the predefined DeviceState values (e. g.
+    DeviceState.ACTIVATED) or supply a numeric value. For valid state values
+    please visit
+    http://projects.gnome.org/NetworkManager/developers/api/09/spec.html
+    #type-NM_DEVICE_STATE
+
+    Please note that this does not set any global properties.
+
+    Returns the new object path.
+    '''
+    path = '/org/freedesktop/NetworkManager/Devices/' + device_name
+    wired_props = {'Carrier': False,
+                   'HwAddress': dbus.String('78:DD:08:D2:3D:43'),
+                   'PermHwAddress': dbus.String('78:DD:08:D2:3D:43'),
+                   'Speed': dbus.UInt32(0)}
+    self.AddObject(path,
+                   'org.freedesktop.NetworkManager.Device.Wired',
+                   wired_props,
+                   [])
+
+    props = {'DeviceType': dbus.UInt32(1),
+             'State': dbus.UInt32(state),
+             'Interface': iface_name,
+             'AvailableConnections': dbus.Array([], signature='o'),
+             'IpInterface': ''}
+
+    obj = dbusmock.get_object(path)
+    obj.AddProperties(DEVICE_IFACE, props)
+
+    devices = self.Get(MAIN_IFACE, 'Devices')
+    devices.append(path)
+    self.Set(MAIN_IFACE, 'Devices', devices)
+
+    self.EmitSignal(
+        'org.freedesktop.NetworkManager', 'DeviceAdded', 'o', [path]
+    )
+
+    return path
+
+
[e-mail](MOCK_IFACE,
+                     in_signature='ssi', out_signature='s')
+def AddWiFiDevice(self, device_name, iface_name, state):
+    '''Add a WiFi Device.
+
+    You have to specify device_name, device interface name (e. g.  wlan0) and
+    state. You can use the predefined DeviceState values (e. g.
+    DeviceState.ACTIVATED) or supply a numeric value. For valid state values,
+    please visit
+    http://projects.gnome.org/NetworkManager/developers/api/09/spec.html
+    #type-NM_DEVICE_STATE
+
+    Please note that this does not set any global properties.
+
+    Returns the new object path.
+    '''
+
+    path = '/org/freedesktop/NetworkManager/Devices/' + device_name
+    self.AddObject(path,
+                   WIRELESS_DEVICE_IFACE,
+                   {
+                       'HwAddress': dbus.String('11:22:33:44:55:66'),
+                       'PermHwAddress': dbus.String('11:22:33:44:55:66'),
+                       'Bitrate': dbus.UInt32(5400),
+                       'Mode': dbus.UInt32(2),
+                       'WirelessCapabilities': dbus.UInt32(255),
+                       'AccessPoints': dbus.Array([], signature='o'),
+                   },
+                   [
+                       ('GetAccessPoints', '', 'ao',
+                        'ret = self.access_points'),
+                       ('GetAllAccessPoints', '', 'ao',
+                        'ret = self.access_points'),
+                       ('RequestScan', 'a{sv}', '', ''),
+                   ])
+
+    dev_obj = dbusmock.get_object(path)
+    dev_obj.access_points = []
+    dev_obj.AddProperties(
+        DEVICE_IFACE,
+        {
+            'ActiveConnection': dbus.ObjectPath('/'),
+            'AvailableConnections': dbus.Array([], signature='o'),
+            'AutoConnect': False,
+            'Managed': True,
+            'Driver': 'dbusmock',
+            'DeviceType': dbus.UInt32(2),
+            'State': dbus.UInt32(state),
+            'Interface': iface_name,
+            'IpInterface': iface_name,
+        }
+    )
+
+    devices = self.Get(MAIN_IFACE, 'Devices')
+    devices.append(path)
+    self.Set(MAIN_IFACE, 'Devices', devices)
+
+    self.EmitSignal(
+        'org.freedesktop.NetworkManager', 'DeviceAdded', 'o', [path]
+    )
+
+    return path
+
+
[e-mail](MOCK_IFACE,
+                     in_signature='ssssuuuyu', out_signature='s')
+def AddAccessPoint(self, dev_path, ap_name, ssid, hw_address,
+                   mode, frequency, rate, strength, security):
+    '''Add an access point to an existing WiFi device.
+
+    You have to specify WiFi Device path, Access Point object name,
+    ssid, hw_address, mode, frequency, rate, strength and security.
+    For valid access point property values, please visit
+    http://projects.gnome.org/NetworkManager/developers/api/09/spec.html#
+    org.freedesktop.NetworkManager.AccessPoint
+
+    Please note that this does not set any global properties.
+
+    Returns the new object path.
+    '''
+    dev_obj = dbusmock.get_object(dev_path)
+    ap_path = '/org/freedesktop/NetworkManager/AccessPoint/' + ap_name
+    if ap_path in dev_obj.access_points:
+        raise dbus.exceptions.DBusException(
+            'Access point %s on device %s already exists' % (ap_name,
+                                                             dev_path),
+            name=MAIN_IFACE + '.AlreadyExists')
+
+    flags = NM80211ApFlags.NM_802_11_AP_FLAGS_PRIVACY
+    if security == NM80211ApSecurityFlags.NM_802_11_AP_SEC_NONE:
+        flags = NM80211ApFlags.NM_802_11_AP_FLAGS_NONE
+
+    self.AddObject(ap_path,
+                   ACCESS_POINT_IFACE,
+                   {'Ssid': dbus.ByteArray(ssid.encode('UTF-8')),
+                    'HwAddress': dbus.String(hw_address),
+                    'Flags': dbus.UInt32(flags),
+                    'LastSeen': dbus.Int32(1),
+                    'Frequency': dbus.UInt32(frequency),
+                    'MaxBitrate': dbus.UInt32(rate),
+                    'Mode': dbus.UInt32(mode),
+                    'RsnFlags': dbus.UInt32(security),
+                    'WpaFlags': dbus.UInt32(security),
+                    'Strength': dbus.Byte(strength)},
+                   [])
+
+    dev_obj.access_points.append(ap_path)
+
+    aps = dev_obj.Get(WIRELESS_DEVICE_IFACE, 'AccessPoints')
+    aps.append(ap_path)
+    dev_obj.Set(WIRELESS_DEVICE_IFACE, 'AccessPoints', aps)
+
+    dev_obj.EmitSignal(
+        WIRELESS_DEVICE_IFACE, 'AccessPointAdded', 'o', [ap_path]
+    )
+
+    return ap_path
+
+
[e-mail](MOCK_IFACE,
+                     in_signature='ssssa{sa{sv}}', out_signature='s')
+def AddWiFiConnection(self, dev_path, connection_name, ssid_name, key_mgmt,
+                      config):
+    '''Add an available connection to an existing WiFi device and access point.
+
+    You have to specify WiFi Device path, Connection object name,
+    SSID and key management.
+
+    The SSID must match one of the previously created access points.
+
+    Please note that this does not set any global properties.
+
+    Returns the new object path.
+    '''
+
+    dev_obj = dbusmock.get_object(dev_path)
+    connection_path = '%s/%s' % (SETTINGS_OBJ, connection_name)
+    connections = dev_obj.Get(DEVICE_IFACE, 'AvailableConnections')
+
+    settings_obj = dbusmock.get_object(SETTINGS_OBJ)
+    main_connections = settings_obj.ListConnections()
+
+    ssid = ssid_name.encode('UTF-8')
+
+    # Find the access point by ssid
+    access_point = None
+    access_points = dev_obj.access_points
+    for ap_path in access_points:
+        ap = dbusmock.get_object(ap_path)
+        if ap.Get(ACCESS_POINT_IFACE, 'Ssid') == ssid:
+            access_point = ap
+            break
+
+    if not access_point:
+        raise dbus.exceptions.DBusException(
+            'Access point with SSID [%s] could not be found' % (ssid_name),
+            name=MAIN_IFACE + '.DoesNotExist')
+
+    hw_address = access_point.Get(ACCESS_POINT_IFACE, 'HwAddress')
+    mode = access_point.Get(ACCESS_POINT_IFACE, 'Mode')
+    security = access_point.Get(ACCESS_POINT_IFACE, 'WpaFlags')
+
+    if connection_path in connections or connection_path in main_connections:
+        raise dbus.exceptions.DBusException(
+            'Connection %s on device %s already exists' % (
+                connection_name, dev_path
+            ),
+            name=MAIN_IFACE + '.AlreadyExists')
+
+    # Parse mac address string into byte array
+    mac_bytes = binascii.unhexlify(hw_address.replace(':', ''))
+
+    settings = {
+        '802-11-wireless': {
+            'seen-bssids': [hw_address],
+            'ssid': dbus.ByteArray(ssid),
+            'mac-address': dbus.ByteArray(mac_bytes),
+            'mode': InfrastructureMode.NAME_MAP[mode]
+        },
+        'connection': {
+            'timestamp': dbus.UInt64(1374828522),
+            'type': '802-11-wireless',
+            'id': ssid_name,
+            'uuid': str(uuid.uuid4())
+        },
+    }
+
+    if security != NM80211ApSecurityFlags.NM_802_11_AP_SEC_NONE:
+        settings['802-11-wireless']['security'] = '802-11-wireless-security'
+        settings['802-11-wireless-security'] = (
+            NM80211ApSecurityFlags.NAME_MAP[security])
+
+    if security == NM80211ApSecurityFlags.NM_802_11_AP_SEC_KEY_MGMT_802_1X:
+        settings['802-1x'] = config['802-1x']
+
+    self.AddObject(
+        connection_path,
+        CSETTINGS_IFACE,
+        {
+            'Settings': dbus.Dictionary(settings, signature='sa{sv}'),
+            'Secrets': dbus.Dictionary({}, signature='sa{sv}'),
+        },
+        [
+            (
+                'Delete', '', '',
+                'self.ConnectionDelete("%s")' % connection_path
+            ),
+            (
+                'GetSettings', '', 'a{sa{sv}}',
+                "ret = self.Get('%s', 'Settings')" % CSETTINGS_IFACE
+            ),
+            (
+                'GetSecrets', 's', 'a{sa{sv}}',
+                "ret = self.Get('%s', 'Secrets')" % CSETTINGS_IFACE
+            ),
+            (
+                'Update', 'a{sa{sv}}', '',
+                'self.ConnectionUpdate("%s", args[0])' % connection_path
+            ),
+        ]
+    )
+
+    connections.append(dbus.ObjectPath(connection_path))
+    dev_obj.Set(DEVICE_IFACE, 'AvailableConnections', connections)
+
+    main_connections.append(connection_path)
+    settings_obj.Set(SETTINGS_IFACE, 'Connections', main_connections)
+
+    settings_obj.EmitSignal(SETTINGS_IFACE, 'NewConnection', 'o', [ap_path])
+
+    return connection_path
+
+
[e-mail](MOCK_IFACE,
+                     in_signature='assssu', out_signature='s')
+def AddActiveConnection(self, devices, connection_device, specific_object,
+                        name, state):
+    '''Add an active connection to an existing WiFi device.
+
+    You have to a list of the involved WiFi devices, the connection path,
+    the access point path, ActiveConnection object name and connection
+    state.
+
+    Please note that this does not set any global properties.
+
+    Returns the new object path.
+    '''
+
+    conn_obj = dbusmock.get_object(connection_device)
+    settings = conn_obj.Get(CSETTINGS_IFACE, 'Settings')
+    conn_uuid = settings['connection']['uuid']
+
+    device_objects = [dbus.ObjectPath(dev) for dev in devices]
+
+    active_connection_path = ACTIVE_CONNECTION_PATH + name
+    self.AddObject(active_connection_path,
+                   ACTIVE_CONNECTION_IFACE,
+                   {
+                       'Devices': device_objects,
+                       'Default6': False,
+                       'Default': True,
+                       'Vpn': False,
+                       'Connection': dbus.ObjectPath(connection_device),
+                       'Master': dbus.ObjectPath('/'),
+                       'SpecificObject': dbus.ObjectPath(specific_object),
+                       'Uuid': conn_uuid,
+                       'State': state,
+                   },
+                   [])
+
+    for dev_path in devices:
+        self.SetDeviceActive(dev_path, active_connection_path)
+
+    active_connections = self.Get(MAIN_IFACE, 'ActiveConnections')
+    active_connections.append(dbus.ObjectPath(active_connection_path))
+    self.SetProperty(
+        MAIN_OBJ, MAIN_IFACE, 'ActiveConnections', active_connections
+    )
+
+    return active_connection_path
+
+
[e-mail](MOCK_IFACE,
+                     in_signature='ss', out_signature='')
+def RemoveAccessPoint(self, dev_path, ap_path):
+    '''Remove the specified access point.
+
+    You have to specify the device to remove the access point from, and the
+    path of the access point.
+
+    Please note that this does not set any global properties.
+    '''
+
+    dev_obj = dbusmock.get_object(dev_path)
+
+    aps = dev_obj.Get(WIRELESS_DEVICE_IFACE, 'AccessPoints')
+    aps.remove(ap_path)
+    dev_obj.Set(WIRELESS_DEVICE_IFACE, 'AccessPoints', aps)
+
+    dev_obj.access_points.remove(ap_path)
+
+    dev_obj.EmitSignal(
+        WIRELESS_DEVICE_IFACE, 'AccessPointRemoved', 'o', [ap_path]
+    )
+
+    self.RemoveObject(ap_path)
+
+
[e-mail](MOCK_IFACE,
+                     in_signature='ss', out_signature='')
+def RemoveWifiConnection(self, dev_path, connection_path):
+    '''Remove the specified WiFi connection.
+
+    You have to specify the device to remove the connection from, and the
+    path of the Connection.
+
+    Please note that this does not set any global properties.
+    '''
+
+    dev_obj = dbusmock.get_object(dev_path)
+    settings_obj = dbusmock.get_object(SETTINGS_OBJ)
+
+    connections = dev_obj.Get(DEVICE_IFACE, 'AvailableConnections')
+    main_connections = settings_obj.ListConnections()
+
+    if (connection_path not in connections and
+            connection_path not in main_connections):
+        return
+
+    connections.remove(dbus.ObjectPath(connection_path))
+    dev_obj.Set(DEVICE_IFACE, 'AvailableConnections', connections)
+
+    main_connections.remove(connection_path)
+    settings_obj.Set(SETTINGS_IFACE, 'Connections', main_connections)
+
+    settings_obj.EmitSignal(
+        SETTINGS_IFACE, 'ConnectionRemoved', 'o', [connection_path]
+    )
+
+    connection_obj = dbusmock.get_object(connection_path)
+    connection_obj.EmitSignal(CSETTINGS_IFACE, 'Removed', '', [])
+
+    self.RemoveObject(connection_path)
+
+
[e-mail](MOCK_IFACE,
+                     in_signature='ss', out_signature='')
+def RemoveActiveConnection(self, dev_path, active_connection_path):
+    '''Remove the specified ActiveConnection.
+
+    You have to specify the device to remove the connection from, and the
+    path of the ActiveConnection.
+
+    Please note that this does not set any global properties.
+    '''
+    self.SetDeviceDisconnected(dev_path)
+
+    active_connections = self.Get(MAIN_IFACE, 'ActiveConnections')
+
+    if active_connection_path not in active_connections:
+        return
+
+    active_connections.remove(dbus.ObjectPath(active_connection_path))
+    self.SetProperty(
+        MAIN_OBJ, MAIN_IFACE, 'ActiveConnections', active_connections
+    )
+
+    self.RemoveObject(active_connection_path)
+
+
[e-mail](SETTINGS_IFACE,
+                     in_signature='a{sa{sv}}', out_signature='o')
+def SettingsAddConnection(self, connection_settings):
+    '''Add a connection.
+
+    connection_settings is a String String Variant Map Map. See
+    https://developer.gnome.org/NetworkManager/0.9/spec.html
+        #type-String_String_Variant_Map_Map
+
+    If you omit uuid, this method adds one for you.
+    '''
+
+    if 'uuid' not in connection_settings['connection']:
+        connection_settings['connection']['uuid'] = str(uuid.uuid4())
+
+    NM = dbusmock.get_object(MAIN_OBJ)
+    settings_obj = dbusmock.get_object(SETTINGS_OBJ)
+    main_connections = settings_obj.ListConnections()
+
+    # Mimic how NM names connections
+    connection_name = str(len(main_connections))
+
+    connection_path = SETTINGS_OBJ + '/' + connection_name
+
+    if connection_path in main_connections:
+        raise dbus.exceptions.DBusException(
+            'Connection %s already exists' % connection_path,
+            name=MAIN_IFACE + '.AlreadyExists',)
+
+    self.AddObject(
+        connection_path,
+        CSETTINGS_IFACE,
+        {
+            'Settings': dbus.Dictionary(
+                connection_settings, signature='sa{sv}'
+            ),
+            'Secrets': dbus.Dictionary({}, signature='sa{sv}'),
+        },
+        [
+            ('Delete', '', '', 'self.ConnectionDelete("%s")' %
+                connection_path),
+            (
+                'GetSettings', '', 'a{sa{sv}}',
+                "ret = self.Get('%s', 'Settings')" % CSETTINGS_IFACE
+            ),
+            (
+                'GetSecrets', 's', 'a{sa{sv}}',
+                "ret = self.Get('%s', 'Secrets')" % CSETTINGS_IFACE
+            ),
+            (
+                'Update', 'a{sa{sv}}', '',
+                'self.ConnectionUpdate("%s", args[0])' % connection_path
+            ),
+        ]
+    )
+
+    main_connections.append(connection_path)
+    settings_obj.Set(SETTINGS_IFACE, 'Connections', main_connections)
+
+    settings_obj.EmitSignal(
+        SETTINGS_IFACE, 'NewConnection', 'o', [connection_path]
+    )
+
+    auto_connect = False
+    if 'autoconnect' in connection_settings['connection']:
+        auto_connect = connection_settings['connection']['autoconnect']
+
+    if auto_connect:
+        dev = None
+        devices = NM.GetDevices()
+
+        # Grab the first device.
+        if len(devices) > 0:
+            dev = devices[0]
+
+        if dev:
+            activate_connection(NM, connection_path, dev, connection_path)
+
+    return connection_path
+
+
[e-mail](CSETTINGS_IFACE,
+                     in_signature='oa{sa{sv}}', out_signature='')
+def ConnectionUpdate(self, connection_path, settings):
+    '''Update settings on a connection.
+
+    settings is a String String Variant Map Map. See
+    https://developer.gnome.org/NetworkManager/0.9/spec.html
+        #type-String_String_Variant_Map_Map
+    '''
+    NM = dbusmock.get_object(MAIN_OBJ)
+    settings_obj = dbusmock.get_object(SETTINGS_OBJ)
+    conn_obj = dbusmock.get_object(connection_path)
+
+    main_connections = settings_obj.ListConnections()
+
+    if connection_path not in main_connections:
+        raise dbus.exceptions.DBusException(
+            'Connection %s does not exist' % connection_path,
+            name=MAIN_IFACE + '.DoesNotExist',)
+
+    conn_settings = conn_obj.Get(CSETTINGS_IFACE, 'Settings')
+    changed_settings = {}
+    for key, value in settings.items():
+        for k, v in value.items():
+            changed_settings[k] = v
+
+            if key not in conn_settings:
+                conn_settings[key] = dbus.Dictionary({}, signature='sv')
+
+            conn_settings[key][k] = v
+
+    conn_obj.Set(CSETTINGS_IFACE, 'Settings', conn_settings)
+
+    settings_obj.EmitSignal(
+        CSETTINGS_IFACE, 'PropertiesChanged', 'a{sv}', [changed_settings]
+    )
+    settings_obj.EmitSignal(CSETTINGS_IFACE, 'Updated', '', [])
+
+    auto_connect = False
+    if 'autoconnect' in settings['connection']:
+        auto_connect = settings['connection']['autoconnect']
+
+    if auto_connect:
+        dev = None
+        devices = NM.GetDevices()
+
+        # Grab the first device.
+        if len(devices) > 0:
+            dev = devices[0]
+
+        if dev:
+            activate_connection(NM, connection_path, dev, connection_path)
+
+    return connection_path
+
+
[e-mail](CSETTINGS_IFACE,
+                     in_signature='o', out_signature='')
+def ConnectionDelete(self, connection_path):
+    '''Deletes a connection.
+
+    This also
+        * removes the deleted connection from any device,
+        * removes any active connection(s) it might be associated with,
+        * removes it from the Settings interface,
+        * as well as deletes the object from the mock.
+
+    Note: If this was the only active connection, we change the global
+    connection state.
+    '''
+    NM = dbusmock.get_object(MAIN_OBJ)
+    settings_obj = dbusmock.get_object(SETTINGS_OBJ)
+
+    # Find the associated active connection(s).
+    active_connections = NM.Get(MAIN_IFACE, 'ActiveConnections')
+    associated_active_connections = []
+    for ac in active_connections:
+        ac_obj = dbusmock.get_object(ac)
+        ac_con = ac_obj.Get(ACTIVE_CONNECTION_IFACE, 'Connection')
+        if ac_con == connection_path:
+            associated_active_connections.append(ac)
+
+    # We found that the connection we are deleting are associated to all
+    # active connections and subsequently set the global state to
+    # disconnected.
+    if len(active_connections) == len(associated_active_connections):
+        self.SetGlobalConnectionState(NMState.NM_STATE_DISCONNECTED)
+
+    # Remove the connection from all associated devices.
+    # We also remove all associated active connections.
+    for dev_path in NM.GetDevices():
+        dev_obj = dbusmock.get_object(dev_path)
+        connections = dev_obj.Get(DEVICE_IFACE, 'AvailableConnections')
+
+        for ac in associated_active_connections:
+            NM.RemoveActiveConnection(dev_path, ac)
+
+        if connection_path not in connections:
+            continue
+
+        connections.remove(dbus.ObjectPath(connection_path))
+        dev_obj.Set(DEVICE_IFACE, 'AvailableConnections', connections)
+
+    # Remove the connection from the settings interface
+    main_connections = settings_obj.ListConnections()
+    if connection_path not in main_connections:
+        return
+    main_connections.remove(connection_path)
+    settings_obj.Set(SETTINGS_IFACE, 'Connections', main_connections)
+    settings_obj.EmitSignal(
+        SETTINGS_IFACE, 'ConnectionRemoved', 'o', [connection_path]
+    )
+
+    # Remove the connection from the mock
+    connection_obj = dbusmock.get_object(connection_path)
+    connection_obj.EmitSignal(CSETTINGS_IFACE, 'Removed', '', [])
+    self.RemoveObject(connection_path)

=== modified file 'tests/autopilot/ubuntu_system_settings/tests/test_wifi.py'
--- tests/autopilot/ubuntu_system_settings/tests/test_wifi.py	2015-04-08 12:15:56 +0000
+++ tests/autopilot/ubuntu_system_settings/tests/test_wifi.py	2015-07-01 18:56:14 +0000
@@ -6,8 +6,13 @@
 # by the Free Software Foundation.
 
 from __future__ import absolute_import
+
+import dbus
+
 from autopilot.matchers import Eventually
-from dbusmock.templates.networkmanager import DEVICE_IFACE
+from dbusmock.templates.networkmanager import (
+    DEVICE_IFACE, NM80211ApSecurityFlags
+)
 from testtools.matchers import Equals
 from time import sleep
 from ubuntu_system_settings.tests import WifiBaseTestCase
@@ -18,6 +23,12 @@
 class WifiTestCase(WifiBaseTestCase):
     """Tests for Language Page"""
 
+    def setUp(self):
+        super(WifiTestCase, self).setUp()
+
+        self.wifi_page._scroll_to_and_click = \
+            self.main_view.scroll_to_and_click
+
     def test_wifi_page_title_is_correct(self):
         """Checks whether Wifi page is available"""
         self.assertThat(
@@ -32,14 +43,62 @@
         self.wifi_page.enable_wireless()
         dialog = self.wifi_page.connect_to_hidden_network(
             'test_ap',
-            scroll_to_and_click=self.main_view
-            .scroll_to_and_click)
-
-        # allow backend to set up listeners
-        sleep(0.3)
-
-        if dialog:
-            dialog.wait_until_destroyed()
+            password='abcdefgh',)
+
+        # allow backend to set up listeners
+        sleep(0.3)
+
+        if dialog:
+            dialog.wait_until_destroyed()
+
+    def test_connect_to_eduroam(self):
+        if not self.wifi_page.have_wireless():
+            self.skipTest('Cannot test wireless since it cannot be enabled')
+        self.addCleanup(
+            self.wifi_page._set_wireless, self.wifi_page.get_wireless())
+        self.wifi_page.enable_wireless()
+        self.create_access_point(
+            'eduroam', 'eduroam',
+            security=NM80211ApSecurityFlags.NM_802_11_AP_SEC_KEY_MGMT_802_1X
+        )
+
+        dialog = self.wifi_page.connect_to_hidden_network(
+            'eduroam',
+            username='student',
+            password='abcdefgh',
+            security='wpa-ep',
+            auth='peap',
+            protocol='mschapv2',
+        )
+
+        # allow backend to set up listeners
+        sleep(0.3)
+
+        if dialog:
+            dialog.wait_until_destroyed()
+
+        dev = dbus.Interface(self.dbus_con.get_object(
+            'org.freedesktop.NetworkManager', self.device_path),
+            'org.freedesktop.DBus.Properties')
+
+        conn_obj = dev.Get(
+            'org.freedesktop.NetworkManager.Device', 'AvailableConnections'
+        )[0]
+        conn = dbus.Interface(self.dbus_con.get_object(
+            'org.freedesktop.NetworkManager', conn_obj),
+            'org.freedesktop.NetworkManager.Settings.Connection')
+
+        conn_settings = conn.GetSettings()
+        wconn = conn_settings['connection']
+        w802_11_sec = conn_settings['802-11-wireless-security']
+        w802_1x = conn_settings['802-1x']
+
+        self.assertEquals(wconn['type'], '802-11-wireless')
+        self.assertEquals(w802_11_sec['key-mgmt'], 'wpa-eap')
+        self.assertIn('peap', w802_1x['eap'])
+        self.assertEquals(w802_1x['identity'], 'student')
+        self.assertEquals(w802_1x['password'], 'abcdefgh')
+        self.assertEquals(w802_1x['phase2-auth'], 'mschapv2')
 
     def test_connect_to_nonexistant_hidden_network(self):
         if not self.wifi_page.have_wireless():
@@ -49,8 +108,8 @@
         self.wifi_page.enable_wireless()
         dialog = self.wifi_page.connect_to_hidden_network(
             'n/a',
-            scroll_to_and_click=self.main_view
-            .scroll_to_and_click)
+            password='abcdefgh',
+        )
 
         # allow backend to set up listeners
         sleep(0.3)
@@ -84,8 +143,7 @@
         self.wifi_page.enable_wireless()
         dialog = self.wifi_page.connect_to_hidden_network(
             'test_ap', security='wpa', password='abcdefgh',
-            scroll_to_and_click=self.main_view
-            .scroll_to_and_click)
+        )
 
         # allow backend to set up listeners
         sleep(0.3)
@@ -102,9 +160,10 @@
             self.wifi_page._set_wireless, self.wifi_page.get_wireless())
         self.wifi_page.enable_wireless()
         dialog = self.wifi_page.connect_to_hidden_network(
-            'test_ap', security='wpa', password='abcdefgh',
-            scroll_to_and_click=self.main_view
-            .scroll_to_and_click)
+            'test_ap',
+            security='wpa',
+            password='abcdefgh',
+        )
 
         # allow backend to set up listeners
         sleep(0.3)
@@ -120,10 +179,7 @@
         self.addCleanup(
             self.wifi_page._set_wireless, self.wifi_page.get_wireless())
         self.wifi_page.enable_wireless()
-        dialog = self.wifi_page.connect_to_hidden_network(
-            'foo',
-            scroll_to_and_click=self.main_view
-            .scroll_to_and_click)
+        dialog = self.wifi_page.connect_to_hidden_network('foo',)
 
         # allow backend to set up listeners
         sleep(0.3)
@@ -131,8 +187,7 @@
         dialog.cancel()
 
         self.assertThat(
-            lambda:
-                len(self.active_connection_mock.GetMethodCalls('Delete')),
+            lambda: len(self.active_connection_mock.GetMethodCalls('Delete')),
             Eventually(Equals(1)))
 
     def test_connect_to_hidden_network_dialog_visibility(self):
@@ -148,8 +203,6 @@
             Eventually(Equals(False)), 'other net dialog not hidden')
 
     def test_remove_previous_network(self):
-        click_method = self.main_view.scroll_to_and_click
-
         access_points = ['Series of Tubes', 'dev/null', 'Mi-Fi',
                          'MonkeySphere']
 
@@ -158,16 +211,14 @@
             self.dbusmock.AddWiFiConnection(
                 self.device_path, 'Mock_Con%d' % idx, ssid, '')
 
-        self.wifi_page.remove_previous_network(
-            access_points[0], scroll_to_and_click=click_method)
+        self.wifi_page.remove_previous_network(access_points[0],)
 
         self.main_view.go_back()
 
         # wait for ui to update
         sleep(2)
 
-        self.wifi_page.remove_previous_network(
-            access_points[2], scroll_to_and_click=click_method)
+        self.wifi_page.remove_previous_network(access_points[2],)
 
         # We cannot make any assertions, because connection deletion
         # is currently not supported.