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

[JkB]

With 1392, I have added basic file picker functionality for choosing cert files.

It arises a general question: Where to store the cert files?

Network Manager (NM) allows to use to different schemes: blob and path [1].
If one uses blob NM parses the content and creates a file uuid-certtype.pem in
/userdata/system-data/etc/NetworkManager/system-connections/ .
At least a unique place to store them with the connection.
For path, a file:///... will be handed over and set in the network configuration.
In my first approach I have decided to use blob as the path scheme did not work for me on desktop environment. Haven't worked on that further.

Thus, at the moment there are three different ways to handle the cert data in the ui.
1. Copy cert content from clipboard
2. absolute path to cert file
3. Use ContentHub to choose file. The file will be stored in .local/share/ubuntu-system-settings/Documents/ . The file URL will be send back to ui.
All end up with parsing the content to NetworkManager as described above.

In general, if there is a general place to store the certs, a Menu should be implemented as propagated in [2]. This Menu than should point to all "installed" certs on the device (system or user).

---
[1] https://developer.gnome.org/NetworkManager/stable/ref-settings.html
[2] https://wiki.ubuntu.com/Networking#wi-fi-authentication-variations

Added support for 802-1x wireless network configurations.
now back on dialog.

[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.

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

1393. By JkB on 2015-05-12

Added CertificateHandling to list installed and add new certificates from OtherNetwork
Now uses ItemSelectors and dataModels. Certs can be added by calling ContentHub.

ToDos:
*improve list update for ItemSelectors
*Add handling for private keys and pac files.
*add password-flags
*add pac-Provisioning
*change? from blob to path scheme for nm configurations no that certs can be stored in a central place.

--- in wifi settings:
*Page (from PageComponents) to manage all installed certs and keys.

1394. By JkB on 2015-05-25

Improved certificate and key handling. List installed and add new certificates from OtherNetwork Dialog.
    Uses ItemSelectors and dataModels to select certs and keys. Certs and keys can be added by calling ContentHub.

    ToDos:
    *improve list update for ItemSelectors
    *Improve handling pac files.
    *change? from blob to path scheme for nm configurations no that certs can be stored in a central place.

    --- in wifi settings:
    *Page (from PageComponents) to manage all "installed" certs and keys.

1395. By JkB on 2015-05-26

Merge with trunk

1396. By JkB on 2015-05-27

merge with trunk.
Fixed bugs.

1397. By JkB on 2015-05-27

removed some bugs,
finally tested on my BQ Aquaris. At least for WPA and a WPA Enterprise TTLS/MCHAP2 connection.
Had no other networks around.

final changes:
*changed to path scheme for cert handling with networkmanager
*removed some further small bugs that made it finally work.

----
ToDos:
*Improve handling of pac Files.
*As suggested, cert and key managment for "installed" ones will be needed.
*Improve CertDialog not to show raw content of cert.
*Implement network encryption detection to use dialog for visible networks as well.

1398. By JkB on 2015-05-31

merge with trunk
----
*added checks against bad cert/key content
*improved data update.

1399. By JkB on 2015-06-03

OtherNetwork extensions mature now.
---
*improved Pac fIle handling.

1400. By JkB on 2015-06-03

*

1401. By JkB on 2015-06-04

formatting

1402. By JkB on 2015-06-08

* ItemSelectors: select back to "None" as standard for cases when filePicker is canceled.
* formatting
----
ToDo (later on):
- change selectedIndex to Item that has been added via ContentHub.

1403. By JkB on 2015-06-08

merge with trunk

1404. By JkB on 2015-06-15

* improve config handling
* fixed bug: added missing nul termination to successfully store certs with path scheme.

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

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.

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

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

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

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"

Unmerged revisions

=== modified file 'plugins/wifi/CMakeLists.txt'
--- plugins/wifi/CMakeLists.txt	2014-09-15 15:39:50 +0000
+++ plugins/wifi/CMakeLists.txt	2015-05-12 23:13:53 +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.cpp
   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-05-12 23:13:53 +0000
@@ -0,0 +1,63 @@
+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 certFileName;
+
+        anchors.fill: parent
+
+        title: i18n.tr("Add Certificate?")
+
+        CertificateHandler {
+            id: certificateHandler
+        }
+
+        TextArea {
+            id : certContent
+            objectName: "certContent"
+            readOnly: true
+            width: parent.width
+            autoSize: true
+            maximumLineCount: 7
+            placeholderText: i18n.tr("No data available.")
+            text: {certificateHandler.getCertContent(certDialog.certFileName).toString()}
+        }
+
+        RowLayout {
+            id: buttonRow
+            anchors {
+                left: parent.left
+                right: parent.right
+            }
+            spacing: units.gu(2)
+            height: cancelButton.height
+
+            Button {
+                id: cancelButton
+                text: i18n.tr("Cancel")
+                onClicked: { certificateHandler.removeFile(certDialog.certFileName);
+                             PopupUtils.close(certDialog);
+                }
+            }
+
+            Button {
+                id: saveButton
+                text: i18n.tr("Add Certificate")
+                enabled: (certDialog.certContent.text !== [])
+                onClicked: { certificateHandler.moveCertFile(certDialog.certFileName);
+                             // just to be sure source file will be deleted if move was not successfull:
+                             certificateHandler.removeFile(certDialog.certFileName);
+                             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-05-12 23:13:53 +0000
@@ -0,0 +1,75 @@
+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
+
+/* with a little help by looking into dekko mail client (lp:dekko) :*/
+PopupBase  {
+    //visible: false
+    id: picker
+
+    /* Picked Ffles will be stored in
+        ~/.local/share/ubuntu-system-settings/Documents/
+
+        At this state of implementation, this store will be used to parse the file to
+        Networkmanager.
+        As I haven't found that it is yet decided where to store cert files in general, all certs will be stored
+        by parsing the cert content to NM. NM then creates a file (UUID-certType.pem) in /userdata/system-data/etc/NetworkManager/system-connections/ .
+        At least a unique place.
+
+        The files in ~/.local/share/ubuntu-system-settings/Documents/
+        will not be deleted. Could be implemented later on.
+        */
+
+
+    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){
+                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-05-12 23:13:53 +0000
@@ -38,14 +38,16 @@
             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
         }
 
         title: i18n.tr("Connect to Hidden Network")
@@ -66,6 +68,19 @@
                     target: connectButtonIndicator
                     running: true
                 }
+
+                PropertyChanges {
+                    target: p2authList
+                    enabled: false
+                }
+                PropertyChanges {
+                    target: p2authListLabel
+                    opacity: 0.5
+                }
+                PropertyChanges {
+                    target: cacertLabel
+                    opacity: 0.5
+                }
                 PropertyChanges {
                     target: passwordVisibleSwitch
                     enabled: false
@@ -79,7 +94,36 @@
                     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: authList
+                    enabled: false
+                    opacity: 0.5
+                }
+                PropertyChanges {
+                    target: authListLabel
+                    opacity: 0.5
+                }
+                PropertyChanges {
+                    target: wepInsecureLabel
                     opacity: 0.5
                 }
                 PropertyChanges {
@@ -102,6 +146,7 @@
                 PropertyChanges {
                     target: feedback
                     enabled: true
+                    visible: true
                 }
             },
             State {
@@ -109,6 +154,7 @@
                 PropertyChanges {
                     target: feedback
                     enabled: true
+                    visible: true
                 }
             },
             State {
@@ -117,10 +163,7 @@
                     target: successIndicator
                     running: true
                 }
-                PropertyChanges {
-                    target: cancelButton
-                    enabled: false
-                }
+
                 PropertyChanges {
                     target: connectAction
                     enabled: false
@@ -142,7 +185,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 +193,8 @@
         TextField {
             id : networkname
             objectName: "networkname"
+            width: parent.width
+            placeholderText: i18n.tr("SSID")
             inputMethodHints: Qt.ImhNoPredictiveText
             Component.onCompleted: forceActiveFocus()
         }
@@ -159,7 +204,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 +212,348 @@
         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: [i18n.tr("TLS"),  // index: 0
+                i18n.tr("TTLS"),     // index: 1
+                i18n.tr("LEAP"),     // index: 2
+                i18n.tr("FAST"),     // index: 3
+                i18n.tr("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: [i18n.tr("PAP"),      // index: 0
+                i18n.tr("MSCHAPv2"), // index: 1
+                i18n.tr("MSCHAP"),   // index: 2
+                i18n.tr("CHAP"),     // index: 3
+                i18n.tr("GTC"),      // index: 4
+                i18n.tr("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  )
+        }
+
+        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  )
+            model: cacertListModel
+            expanded: false
+            delegate: certSelectorDelegate
+            selectedIndex: 0
+            property string cacertFileName : { if(cacertSelector.selectedIndex !== 0 &&
+                                                  cacertSelector.selectedIndex !== (certListModel.rowCount()-1)){
+                                                  certListModel.getfileName(cacertSelector.selectedIndex)
+                                                } else {"";}
+                                              }
+            onSelectedIndexChanged: {
+                cacertListModel.dataupdate();
+                if (cacertSelector.selectedIndex === cacertListModel.rowCount()-1){
+                    var pickerDialog = PopupUtils.open(Qt.resolvedUrl("./CertPicker.qml"));
+                    pickerDialog.fileImportSignal.connect(function(file){
+                        certDialogLoader.source = "./CertDialog.qml";
+                        PopupUtils.open(certDialogLoader.item, cacertSelector, {certFileName: file});
+                    });
+                }
+            }
+
+
+        }
+
+        Component{
+            id: certSelectorDelegate
+            OptionSelectorDelegate { text: CommonName;
+                                     subText:(CommonName != "None" && CommonName != "Choose file…") ?
+                                             (Organization +", Exp.date: " + expiryDate) : ""
+            }
+        }
+        CertificateListModel {
+            id: cacertListModel
+        }
+
+        Loader{
+            id: certDialogLoader
+            asynchronous: false
+        }
+
+        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(usercertFileName.selectedIndex !== 0 &&
+                                                   usercertFileName.selectedIndex !== (certListModel.rowCount()-1)){
+                                                   certListModel.getfileName(usercertFileName.selectedIndex)
+                                                 } else {"";}
+                                               }
+            onSelectedIndexChanged: {
+                if (usercertSelector.selectedIndex === cacertListModel.rowCount()-1){
+                    var pickerDialog = PopupUtils.open(Qt.resolvedUrl("./CertPicker.qml"));
+                    pickerDialog.fileImportSignal.connect(function(file){
+                    });
+                }
+            }
+        }
+
+        /*CertificateListModel {
+                id: usercertListModel
+            }*/
+
+        RowLayout{
+            spacing: units.gu(4)
+            anchors {
+                left: parent.left
+                right: parent.right
+            }
+            visible:    ( securityList.selectedIndex == 2 || securityList.selectedIndex == 4)
+                        && ( authList.selectedIndex == 0 ) // only for TLS
+
+            Label {
+                id: userprivatekeyLabel
+                text : i18n.tr("User Private Key")
+                objectName: "userprivatekeyLabel"
+                fontSize: "medium"
+                font.bold: false
+                color: Theme.palette.selected.backgroundText
+                anchors.bottom: adduserprivatekeyButton.bottom
+            }
+
+            Button {
+                id: adduserprivatekeyButton
+                visible: true
+                objectName: "adduserprivatekeyButton"
+                anchors.right: parent.right
+                text: i18n.tr("Choose file…")
+                onClicked: {
+                    var pickerDialog = PopupUtils.open(Qt.resolvedUrl("./CertPicker.qml"));
+                    pickerDialog.fileImportSignal.connect(function(file){
+                        userprivatekey.text = file;
+                    });
+                }
+            }
+        }
+
+        TextArea {
+            id : userprivatekey
+            objectName: "userprivatekey"
+            visible:    ( securityList.selectedIndex == 2 || securityList.selectedIndex == 4)
+                        && ( authList.selectedIndex == 0 )
+            width: parent.width
+            autoSize: true
+            maximumLineCount: 4
+            placeholderText: i18n.tr("Absolute path to key or clipboard content")
+        }
+
+        Column{     // pacFile
+            id: pacFileColumn
+            anchors {
+                left: parent.left
+                right: parent.right
+            }
+            spacing: parent.spacing
+
+            visible:    ( securityList.selectedIndex == 2 || securityList.selectedIndex == 4)
+                        && ( authList.selectedIndex == 3 )
+
+            RowLayout{
+                spacing: units.gu(4)
+                anchors {
+                    left: parent.left
+                    right: parent.right
+                }
+
+                Label {
+                    id: pacFileLabel
+                    text : i18n.tr("Pac File")
+                    objectName: "pacFileLabel"
+                    fontSize: "medium"
+                    font.bold: false
+                    color: Theme.palette.selected.backgroundText
+                    anchors.bottom: adduserprivatekeyButton.bottom
+                }
+
+                Button {
+                    id: addpacFileButton
+                    visible: true
+                    objectName: "addpacFileButton"
+                    anchors.right: parent.right
+                    text: i18n.tr("Choose file…")
+                    onClicked: {
+                        var pickerDialog = PopupUtils.open(Qt.resolvedUrl("./CertPicker.qml"));
+                        pickerDialog.fileImportSignal.connect(function(file){
+                        PopupUtils.open(Qt.resolvedUrl("./CertDialog.qml"), {certContentText: file}); //         pacFile.text = file;
+                        });
+                    }
+                }
+            }
+
+            TextArea {
+                id : pacFile
+                objectName: "pacFile"
+                width: parent.width
+                autoSize: true
+                maximumLineCount: 4
+                placeholderText: i18n.tr("Absolute path to Pac File or clipboard content")
+            }
+
+        }
+
+        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
+            Component.onCompleted: forceActiveFocus()
+            onAccepted: {
+                connectAction.trigger()
+            }
+        }
+
+        Label {
+            id: usernameLabel
+            text : {
+                if (     ( securityList.selectedIndex == 2 || securityList.selectedIndex == 4)
+                        && ( authList.selectedIndex == 0 )) {
+                    i18n.tr("Identity")
+                }
+                else {
+                    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
+            Component.onCompleted: forceActiveFocus()
+            onAccepted: {
+                connectAction.trigger()
+            }
+        }
+
+        Label {
+            id: passwordLabel
+            text: {
+                if (    ( securityList.selectedIndex == 2 || securityList.selectedIndex == 4)
+                        && ( authList.selectedIndex == 0 )) {
+                    i18n.tr("Private Key Password")
+                } else {
+                    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 +562,17 @@
         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();
             }
         }
 
-        Row {
+        Row {
             id: passwordVisiblityRow
             layoutDirection: Qt.LeftToRight
             spacing: units.gu(2)
@@ -204,7 +580,7 @@
 
             CheckBox {
                 id: passwordVisibleSwitch
-                activeFocusOnPress: false
+                //activeFocusOnPress: false
             }
 
             Label {
@@ -222,10 +598,44 @@
                     }
                     onClicked: {
                         passwordVisibleSwitch.checked =
-                            !passwordVisibleSwitch.checked
-                    }
-                }
-            }
+                                !passwordVisibleSwitch.checked
+                    }
+                }
+            }
+        }
+
+        Row {
+            id: passwordRememberRow
+            layoutDirection: Qt.LeftToRight
+            spacing: units.gu(2)
+            visible: false
+            //( authList.selectedIndex == 1 || authList.selectedIndex == 3 || authList.selectedIndex == 4)
+            //not implemented yet.
+            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
+                    }
+                }
+            }
+
         }
 
         RowLayout {
@@ -287,9 +697,13 @@
             enabled: settingsValid()
             onTriggered: {
                 DbusHelper.connect(
-                    networkname.text,
-                    securityList.selectedIndex,
-                    password.text);
+                            networkname.text,
+                            securityList.selectedIndex,
+                            authList.selectedIndex,
+                            [username.text, anonymousIdentity.text],
+                            password.text,
+                            [cacertSelector.cacertFileName, usercertSelector.usercertFileName, userprivatekey.text, pacFile.text] ,
+                            p2authList.selectedIndex);
                 otherNetworkDialog.state = "CONNECTING";
             }
         }
@@ -321,15 +735,15 @@
                 */
                 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-05-12 23:13:53 +0000
@@ -0,0 +1,144 @@
+#include "certhandler.h"
+
+#include <QtQml>
+#include <QtQml/QQmlContext>
+#include <QtDebug>
+#include <QObject>
+#include <QSslCertificate>
+#include <QAbstractListModel>
+#include <QDir>
+
+#define CERTS_PATH "/home/phablet/.local/share/ubuntu-system-settings/Documents/"  //<----to be changed #jkb
+#define KEYS_PATH  "/home/phablet/.local/share/ubuntu-system-settings/Documents/"
+/*
+CERTS_PATH points to the certificates directory. 
+Later on should/could be .../ubuntu-system-settings/wifi/ssl/certs
+CA and client to be stored here.
+and KEYS_PATH to private keys
+Cold be .../ubuntu-system-settings/wifi/ssl/keys
+
+Same for pac files?
+*/
+
+QByteArray CertificateHandler::getCertContent(QString filename){
+    QFile file(filename);
+      if (!file.open(QIODevice::ReadOnly)) {
+            qWarning() << "Could not resolve Cert-File (" << filename << "): File does not exist or is empty." ;
+            return QByteArray();
+      }
+      else {
+            return file.readAll();
+      }
+}
+
+QString CertificateHandler::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> SslCertificate = QSslCertificate::fromData(certificate, QSsl::Pem);
+    QStringList subject = SslCertificate[0].subjectInfo(QSslCertificate::CommonName);
+    QString modFileName = CERTS_PATH+subject[0]+".pem";
+    if(file.rename(modFileName.replace(" ", "_"))){
+        return file.fileName();
+    } else {
+        return "Error storing certificate." ;
+    }
+}
+
+bool CertificateHandler::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 file…");
+    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 file…");
+        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 "";
+            //case certFileNameRole : 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 "";
+            //case certFileNameRole : 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");
+    //case certFileNameRole : return row;
+
+    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-05-12 23:13:53 +0000
@@ -0,0 +1,45 @@
+#ifndef CERTHANDLER_H
+#define CERTHANDLER_H
+
+#include <QtQml>
+#include <QtQml/QQmlContext>
+#include <QObject>
+#include <QAbstractListModel>
+
+class CertificateHandler : public QObject
+{
+    Q_OBJECT
+public:
+    Q_INVOKABLE QByteArray getCertContent(QString filename);
+    Q_INVOKABLE QString moveCertFile(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;
+
+};
+#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-05-12 23:13:53 +0000
@@ -22,6 +22,7 @@
 #include "unitymenumodelstack.h"
 #include "wifidbushelper.h"
 #include "previousnetworkmodel.h"
+#include "certhandler.h"
 
 namespace {
 
@@ -45,6 +46,8 @@
     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<CertificateHandler>(uri, 1, 0, "CertificateHandler");
 }
 
 void BackendPlugin::initializeEngine(QQmlEngine *engine, const char *uri)

=== modified file 'plugins/wifi/wifidbushelper.cpp'
--- plugins/wifi/wifidbushelper.cpp	2014-10-10 14:10:52 +0000
+++ plugins/wifi/wifidbushelper.cpp	2015-05-12 23:13:53 +0000
@@ -37,15 +37,29 @@
 typedef QMap<QString,QVariantMap> ConfigurationData;
 Q_DECLARE_METATYPE(ConfigurationData)
 
+
 WifiDbusHelper::WifiDbusHelper(QObject *parent) : QObject(parent),
       m_systemBusConnection(QDBusConnection::systemBus())
 {
     qDBusRegisterMetaType<ConfigurationData>();
 }
 
-void WifiDbusHelper::connect(QString ssid, int security, QString password)
+
+QByteArray WifiDbusHelper::getCertContent(QString filename){
+    QFile file(filename);
+      if (!file.open(QIODevice::ReadOnly)) {
+            qWarning() << "Could not resolve Cert-File (" << filename << "): File does not exist or is empty." ;
+            return QByteArray();
+      }
+      else {
+            return file.readAll();
+      }
+}
+
+
+void WifiDbusHelper::connect(QString ssid, int security, int auth, QStringList usernames, QString 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;
     }
@@ -66,8 +80,11 @@
     // 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;
@@ -75,17 +92,124 @@
         if (security == 1) {
             wireless_security["key-mgmt"] = QStringLiteral("wpa-psk");
             wireless_security["psk"] = password;
-        } else if (security == 2) {
+        } else if (security == 3) {
             wireless_security["key-mgmt"] = QStringLiteral("none");
             wireless_security["auth-alg"] = QStringLiteral("open");
             wireless_security["wep-key0"] = password;
             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;
         }
         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;
+    }
+
+    QByteArray cacert_a, clientcert, privatekey, pacFile;
+
+    if (certs[0].left(1) == "/"){
+        cacert_a = getCertContent(certs[0]);
+    }
+    else {
+        cacert_a.append(certs[0]);
+    }
+
+    if (auth == 0) { // TLS
+        wireless_802_1x["eap"] = QStringList("tls");
+        wireless_802_1x["ca-cert"]  = cacert_a;
+
+        if (certs[1].left(1) == "/"){
+            clientcert = getCertContent(certs[1]);
+        }
+        else {
+            clientcert.append(certs[1]);
+        }
+        wireless_802_1x["client-cert"]  = clientcert;
+        if (certs[2].left(1) == "/"){
+            privatekey = getCertContent(certs[2]);
+        }
+        else {
+            privatekey.append(certs[2]);
+        }
+        wireless_802_1x["private-key"]  = privatekey;
+        wireless_802_1x["private-key-password"] = password;
+    } else if (auth == 1) { // TTLS
+        wireless_802_1x["eap"] = QStringList("ttls");
+        wireless_802_1x["ca-cert"]  = cacert_a;
+        wireless_802_1x["anonymous-identity"]  = usernames[1];
+    } else if (auth == 2) { // LEAP
+        wireless_802_1x["eap"] = QStringList("leap");
+    } else if (auth == 3) { // FAST
+        wireless_802_1x["eap"] = QStringList("fast");
+        wireless_802_1x["ca-cert"]  = cacert_a;
+        wireless_802_1x["anonymous-identity"]  = usernames[1];
+
+        if (certs[3].left(1) == "/"){
+            pacFile = getCertContent(certs[3]);
+        }
+        else {
+            pacFile.append(certs[3]);
+        }
+        wireless_802_1x["pac-file"]  = pacFile;
+        // wireless_802_1x["phase1-fast-provisioning"] = QString("0");
+    } else if (auth == 4) { // PEAP
+        wireless_802_1x["eap"] = QStringList("peap");
+        wireless_802_1x["phase1-peaplabel"] = QString("1");
+        wireless_802_1x["anonymous-identity"]  = usernames[1];
+       //wireless_802_1x["phase1-peapver"] = QString("0"); #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();
@@ -142,6 +266,7 @@
     }
 }
 
+
 void WifiDbusHelper::nmDeviceStateChanged(uint newState,
                                            uint oldState,
                                            uint reason)
@@ -150,6 +275,7 @@
     Q_EMIT (deviceStateChanged(newState, reason));
 }
 
+
 QString WifiDbusHelper::getWifiIpAddress()
 {
     OrgFreedesktopNetworkManagerInterface mgr(NM_SERVICE,
@@ -193,6 +319,7 @@
     return QString(inet_ntoa(ip_addr));
 }
 
+
 struct Network : public QObject
 {
     struct DontCare : public std::exception {};
@@ -345,6 +472,7 @@
     QMap<QString, QVariantMap> settings;
 };
 
+
 QList<QStringList> WifiDbusHelper::getPreviouslyConnectedWifiNetworks() {
     QList<QStringList> networks;
 
@@ -383,6 +511,7 @@
     return networks;
 }
 
+
 void WifiDbusHelper::forgetConnection(const QString dbus_path) {
     OrgFreedesktopNetworkManagerSettingsConnectionInterface bar
             (NM_SERVICE,
@@ -395,6 +524,7 @@
     }
 }
 
+
 bool WifiDbusHelper::forgetActiveDevice() {
     OrgFreedesktopNetworkManagerInterface mgr(NM_SERVICE,
                                               NM_PATH,

=== modified file 'plugins/wifi/wifidbushelper.h'
--- plugins/wifi/wifidbushelper.h	2014-10-10 14:10:52 +0000
+++ plugins/wifi/wifidbushelper.h	2015-05-12 23:13:53 +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, QString password, QStringList certs, int p2auth);
     Q_INVOKABLE QList<QStringList> getPreviouslyConnectedWifiNetworks();
     Q_INVOKABLE void forgetConnection(const QString dbus_path);
     Q_INVOKABLE bool forgetActiveDevice();
@@ -52,6 +52,7 @@
 private:
     QDBusConnection m_systemBusConnection;
     QString getWifiIpAddress();
+    QByteArray getCertContent(QString filename);
 };