Merge lp:~ajalkane/ubuntu-filemanager-app/require-screenlock-password into lp:ubuntu-filemanager-app

[Arto Jalkanen]

Only show files and allow operating in non-MTP folders unless password explicitly given.

Only show files and allow operating in non-MTP folders unless password explicitly given.

# Notes:
- Click package available for testing at: http://people.canonical.com/~dpm/click/com.ubuntu.filemanager_0.3.251_armhf.click
- It seems querying the device security over D-BUS only works if "Passphrase" is selected. When choosing from "Swipe (no security)" into "4-digit passcode", then the call still returns "false". We're assuming this is a bug in the backend.
- Some operations need to be guarded against operating in non-MTP folders (deleting, renaming, pasting into non-allowed directory). That's implemented in this branch, but in the future it should be improved to show some error when the user tries to do such operations. But at least now nothing destructive should be possible even though File Manager silently refuses what's asked.

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:251
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/291/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1327
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1327/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-utopic-amd64-ci/89

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/291/rebuild

review: Needs Fixing (continuous-integration)

[Nicholas Skaggs (nskaggs)]

Tests are failing due to missing depends

file:///usr/share/filemanager/qml/filemanager.qml:26:1: module "com.ubuntu.PamAuthentication" is not installed

[Arto Jalkanen (ajalkane)]

> Tests are failing due to missing depends
>
> file:///usr/share/filemanager/qml/filemanager.qml:26:1: module
> "com.ubuntu.PamAuthentication" is not installed

What's up with that? It gets packaged into the click package. Can you tell what's the place to fix this?

[David Planella (dpm)]

That's probably because the branch does not package up the PAM plugin as a
.deb package. Jenkins runs the tests on the desktop, and expects to install
everything as a debian package. Let me have a quick look at it.

On Thu, Aug 7, 2014 at 5:36 PM, Arto Jalkanen <email address hidden> wrote:

> > Tests are failing due to missing depends
> >
> > file:///usr/share/filemanager/qml/filemanager.qml:26:1: module
> > "com.ubuntu.PamAuthentication" is not installed
>
> What's up with that? It gets packaged into the click package. Can you tell
> what's the place to fix this?
> --
>
> https://code.launchpad.net/~ajalkane/ubuntu-filemanager-app/require-screenlock-password/+merge/229865
> Your team Ubuntu File Manager Developers is requested to review the
> proposed merge of
> lp:~ajalkane/ubuntu-filemanager-app/require-screenlock-password into
> lp:ubuntu-filemanager-app.
>

[David Planella (dpm)]

Arto, I've fixed this in a branch you can merge into yours, could you do a:

bzr merge lp:~dpm/ubuntu-filemanager-app/add-pamauth-packaging

Followed by a push? This should resolve the packaging dependency, but I'm guessing that the tests might need tweaking to press the button to show all files?

[lp:~ajalkane/ubuntu-filemanager-app/require-screenlock-password]

252. By Arto Jalkanen on 2014-08-07

PamAuthentication deb dependency.

[Arto Jalkanen (ajalkane)]

> Arto, I've fixed this in a branch you can merge into yours, could you do a:
>
> bzr merge lp:~dpm/ubuntu-filemanager-app/add-pamauth-packaging
>
> Followed by a push? This should resolve the packaging dependency, but I'm
> guessing that the tests might need tweaking to press the button to show all
> files?

Thank you! I've done the merge and updated the branch.

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:252
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/292/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1401
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1401/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-utopic-amd64-ci/90

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/292/rebuild

review: Needs Fixing (continuous-integration)

[Arto Jalkanen (ajalkane)]

> Followed by a push? This should resolve the packaging dependency, but I'm
> guessing that the tests might need tweaking to press the button to show all
> files?

This depends on if the test environment has UnityGreeter to answer the DBus queries about authentication required. If it has, and it's set to "Swipe unlock", then the tests might just work. Otherwise they no doubt have to be modified.

[Nicholas Skaggs (nskaggs)]

Add qtdeclarative5-pamauthentication0.1 as a depends to ubuntu-filemanager-app. The autopilot package will pull from there.

[David Planella (dpm)]

Argh, yes, I forgot to add the dependency. It should be just a one-line
change. Arto, I could prepare a branch, but I think it might be easier if
you just add the qtdeclarative5-
pamauthentication0.1 dependency to debian/control.

On Thu, Aug 7, 2014 at 9:39 PM, Nicholas Skaggs <
<email address hidden>> wrote:

> Add qtdeclarative5-pamauthentication0.1 as a depends to
> ubuntu-filemanager-app. The autopilot package will pull from there.
> --
>
> https://code.launchpad.net/~ajalkane/ubuntu-filemanager-app/require-screenlock-password/+merge/229865
> Your team Ubuntu File Manager Developers is requested to review the
> proposed merge of
> lp:~ajalkane/ubuntu-filemanager-app/require-screenlock-password into
> lp:ubuntu-filemanager-app.
>

[lp:~ajalkane/ubuntu-filemanager-app/require-screenlock-password]

253. By Arto Jalkanen on 2014-08-07

Added pamauthentication plugin dependency to filemanager deb build.

[Arto Jalkanen (ajalkane)]

> Argh, yes, I forgot to add the dependency. It should be just a one-line
> change. Arto, I could prepare a branch, but I think it might be easier if
> you just add the qtdeclarative5-
> pamauthentication0.1 dependency to debian/control.

Yes, I see what you mean. Added and updated.

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:253
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/293/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1409
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1409/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-utopic-amd64-ci/91

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/293/rebuild

review: Needs Fixing (continuous-integration)

[David Planella (dpm)]

Now I'm confused by the failing test. Did Jenkins not install the required package? Or perhaps I made a mistake in the packaging?

[Arto Jalkanen (ajalkane)]

> Now I'm confused by the failing test. Did Jenkins not install the required
> package? Or perhaps I made a mistake in the packaging?

To me the depends blocks seem just the same as for placesmodel that is used without problems. Yet in the output for pamauthentication it shows this:

dpkg-gencontrol: warning: Depends field of package qtdeclarative5-pamauthentication0.1: unknown substitution variable ${shlibs:Depends}
dpkg-gencontrol: warning: Depends field of package qtdeclarative5-pamauthentication0.1: unknown substitution variable ${misc:Pre-Depends}

No idea why suddenly that doesn't work.

[Nicholas Skaggs (nskaggs)]

Jenkins built the package alright, but look at what's inside it. Nothing.

[Nicholas Skaggs (nskaggs)]

Download this zip and have a look at the package contents:

http://91.189.93.70:8080/job/generic-mediumtests-utopic/1409/artifact/work/output/*zip*/output.zip

[David Planella (dpm)]

Argh, that's what happens when you do coding between phone calls. I tested
the package to build and have the right contents, but I bet I failed to
commit the .install file. I'll prepare another branch in about 1 h.
El dia 08/08/2014 0.24, "Nicholas Skaggs" <email address hidden>
va escriure:

> Download this zip and have a look at the package contents:
>
>
> http://91.189.93.70:8080/job/generic-mediumtests-utopic/1409/artifact/work/output/*zip*/output.zip
> --
>
> https://code.launchpad.net/~ajalkane/ubuntu-filemanager-app/require-screenlock-password/+merge/229865
> Your team Ubuntu File Manager Developers is requested to review the
> proposed merge of
> lp:~ajalkane/ubuntu-filemanager-app/require-screenlock-password into
> lp:ubuntu-filemanager-app.
>

[David Planella (dpm)]

Ok, fixed. Arto, could you do another 'bzr lp:~dpm/ubuntu-filemanager-app/add-pamauth-packaging', commit and push?

[Arto Jalkanen (ajalkane)]

> Ok, fixed. Arto, could you do another 'bzr lp:~dpm/ubuntu-filemanager-app/add-
> pamauth-packaging', commit and push?

I'm at work so can't do that anytime soon, but I tried to do a merge proposal from launchpad and hopefully it goes well.

Unmerged revisions

=== modified file 'README'
--- README	2014-04-26 06:35:52 +0000
+++ README	2014-08-07 20:04:19 +0000
@@ -8,7 +8,7 @@
 
 Install the following build dependencies:
 
-    sudo apt-get install libtag1-dev 
+    sudo apt-get install libtag1-dev libpam0g-dev python3
 
 Then open the CMakeLists.txt file in Qt Creator, and ensure that the kit
 selected on the left sidebar (just above the green "Run" button) is "Desktop"
@@ -16,7 +16,9 @@
 ### For a device
 
 If you don't have one already, you'll need to create an armhf chroot to
-cross-compile the app. Here's how:
+cross-compile the app (also do this if you have an older armhf chroot, for
+example 14.04 and current target is 14.10. You can first delete the old target
+and then create a current one). Here's how:
 
 1. In Qt Creator, open the CMakeLists.txt file
 2. Go to Tools > Options > Ubuntu > Click
@@ -26,7 +28,7 @@
 4. Once created, you'll need to add the build dependencies for the app:
   - Click on the Maintain button on your chroot
   - On the terminal prompt that is started, type 
-    apt-get install libtag1-dev:armhf'
+    apt-get install libtag1-dev:armhf libpam0g-dev:armhf python3
   - Close the terminal when the installation finishes
 5. Now you can either do a clean checkout and wait to be prompted by Qt Creator
    to add the armhf kit, or alternatively:
@@ -112,7 +114,7 @@
 Run the following commands to manually install the click package (replace 0.5
 with the version of your package):
 
-    adb push /home/phablet com.ubuntu.filemanager_0.3_armhf.click
+    adb push com.ubuntu.filemanager_0.3.latest_armhf.click /home/phablet/
     adb shell
     sudo -H -u phablet pkcon install-local /home/phablet/com.ubuntu.filemanager_0.3_armhf.click
 

=== modified file 'debian/control'
--- debian/control	2014-07-28 12:52:31 +0000
+++ debian/control	2014-08-07 20:04:19 +0000
@@ -9,6 +9,7 @@
                pkg-kde-tools,
 	       python3-all,
                libtag1-dev,
+               libpam0g-dev,
 Standards-Version: 3.9.5
 Section: misc
 Homepage: https://launchpad.net/ubuntu-filemanager-app
@@ -22,6 +23,7 @@
          qtdeclarative5-hud1.0,
          qtdeclarative5-nemo-qml-plugin-folderlistmodel,
          qtdeclarative5-placesmodel0.1,
+         qtdeclarative5-pamauthentication0.1,
          qtdeclarative5-qtquick2-plugin,
          qtdeclarative5-u1db1.0,
          qtdeclarative5-ubuntu-ui-toolkit-plugin | qt-components-ubuntu,
@@ -52,6 +54,16 @@
  This package contains a plugin that enables QML apps to list and
  modify a set of places (bookmarks) in the file system.
 
+Package: qtdeclarative5-pamauthentication0.1
+Architecture: any
+Multi-Arch: same
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+         ${misc:Pre-Depends},
+Description: PAM authentication QML plugin
+ This package contains a plugin that enables QML apps to do
+ password authentication via the PAM API.
+
 Package: ubuntu-filemanager-app-autopilot
 Architecture: all
 Depends: ${misc:Depends},

=== modified file 'src/app/qml/filemanager.qml'
--- src/app/qml/filemanager.qml	2014-07-01 22:41:29 +0000
+++ src/app/qml/filemanager.qml	2014-08-07 20:04:19 +0000
@@ -23,6 +23,7 @@
 import U1db 1.0 as U1db
 import Ubuntu.Content 0.1
 import com.ubuntu.PlacesModel 0.1
+import com.ubuntu.PamAuthentication 0.1
 
 import "ui"
 
@@ -77,6 +78,11 @@
        id: userplaces
     }
 
+    PamAuthentication {
+        id: pamAuthentication
+        serviceName: "filemanager"
+    }
+
     // HUD Actions
     Action {
         id: settingsAction

=== added file 'src/app/qml/ui/AuthenticationDialog.qml'
--- src/app/qml/ui/AuthenticationDialog.qml	1970-01-01 00:00:00 +0000
+++ src/app/qml/ui/AuthenticationDialog.qml	2014-08-07 20:04:19 +0000
@@ -0,0 +1,80 @@
+/*
+ * Copyright (C) 2014 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Arto Jalkanen <[e-mail]>
+ */
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import Ubuntu.Components.Popups 0.1
+
+Dialog {
+    id: root
+
+    title: i18n.tr("Authentication required")
+
+    text: i18n.tr("Enter password:")
+
+    signal passwordEntered(string password)
+
+    Component.onCompleted: {
+        passwordField.forceActiveFocus()
+    }
+
+    TextField {
+        id: passwordField
+        objectName: "inputField"
+
+        placeholderText: i18n.tr("password")
+        echoMode: TextInput.Password
+
+        onAccepted: okButton.clicked(text)
+    }
+
+    Button {
+        id: okButton
+        objectName: "okButton"
+
+        text: i18n.tr("Ok")
+
+        onClicked: {
+            console.log("Ok clicked with password " + passwordField.text)
+
+            passwordEntered(passwordField.text)
+            PopupUtils.close(root)
+        }
+    }
+
+    Button {
+        id: cancelButton
+        objectName: "cancelButton"
+        text: i18n.tr("Cancel")
+
+        gradient: Gradient {
+            GradientStop {
+                position: 0
+                color: "gray"
+            }
+
+            GradientStop {
+                position: 1
+                color: "lightgray"
+            }
+        }
+
+        onClicked: {
+            PopupUtils.close(root)
+        }
+    }
+}

=== modified file 'src/app/qml/ui/FolderListPage.qml'
--- src/app/qml/ui/FolderListPage.qml	2014-07-28 17:26:29 +0000
+++ src/app/qml/ui/FolderListPage.qml	2014-08-07 20:04:19 +0000
@@ -86,6 +86,7 @@
         id: pageModel
         path: folderListPage.folder
         enableExternalFSWatcher: true
+        showNonMTPPaths: !pamAuthentication.requireAuthentication()
 
         // Properties to emulate a model entry for use by FileDetailsPopover
         property bool isDir: true
@@ -355,21 +356,21 @@
             left: sidebar.right
             right: parent.right
         }
-        height: fileSelectorMode ? bottomBarFileSelectorButtons.height : 0
+        height: bottomBarButtons.visible ? bottomBarButtons.height : 0
         visible: fileSelectorMode
-
     }
 
     Row {
-        id: bottomBarFileSelectorButtons
+        id: bottomBarButtons
         anchors.horizontalCenter: parent.horizontalCenter
         anchors.bottom: bottomBar.bottom
         spacing: units.gu(5)
-        visible: fileSelectorMode
+        visible: fileSelectorMode || !pageModel.showNonMTPPaths
 
         Button {
             text: i18n.tr("Select")
             enabled: selectionManager.counter > 0
+            visible: fileSelectorMode
             onClicked: {
                var selectedAbsPaths = selectionManager.selectedAbsFilePaths();
                // For now support only selection in filesystem
@@ -383,14 +384,37 @@
         }
         Button {
            text: i18n.tr("Cancel")
+           visible: fileSelectorMode
            onClicked: {
                console.log("FileSelector cancelled")
                cancelFileSelector()
            }
         }
+        Button {
+            text: i18n.tr("Unlock full access")
+            visible: !pageModel.showNonMTPPaths
+            onClicked: {
+                console.log("Full access clicked")
+                var authDialog = PopupUtils.open(Qt.resolvedUrl("AuthenticationDialog.qml"),
+                                                folderListPage)
+
+                authDialog.passwordEntered.connect(function(password) {
+                    if (pamAuthentication.validatePasswordToken(password)) {
+                        console.log("Authenticated for full access")
+                        pageModel.showNonMTPPaths = true
+                    } else {
+                        PopupUtils.open(Qt.resolvedUrl("NotifyDialog.qml"), folderListPage,
+                                        {
+                                            title: i18n.tr("Authentication failed")
+                                        })
+
+                        console.log("Could not authenticate")
+                    }
+                })
+            }
+        }
     }
 
-
     FolderIconView {
         id: folderIconView
 

=== modified file 'src/plugin/CMakeLists.txt'
--- src/plugin/CMakeLists.txt	2014-06-21 21:59:52 +0000
+++ src/plugin/CMakeLists.txt	2014-08-07 20:04:19 +0000
@@ -6,3 +6,4 @@
 
 add_subdirectory(folderlistmodel)
 add_subdirectory(placesmodel)
+add_subdirectory(pamauthentication)

=== modified file 'src/plugin/folderlistmodel/dirmodel.cpp'
--- src/plugin/folderlistmodel/dirmodel.cpp	2014-06-17 21:41:59 +0000
+++ src/plugin/folderlistmodel/dirmodel.cpp	2014-08-07 20:04:19 +0000
@@ -61,13 +61,14 @@
 #include <QMetaType>
 #include <QDateTime>
 #include <QMimeType>
+#include <QStandardPaths>
 
 #if defined(REGRESSION_TEST_FOLDERLISTMODEL)
 # include <QColor>
 # include <QBrush>
 #endif
 
-
+#include <array>
 
 
 
@@ -80,6 +81,26 @@
 
 namespace {
     QHash<QByteArray, int> roleMapping;
+    QList<QString> mtpDirectories;
+
+    std::array<QStandardPaths::StandardLocation, 5> mtpStandardLocations = {
+        QStandardPaths::DocumentsLocation,
+        QStandardPaths::DownloadLocation,
+        QStandardPaths::MusicLocation,
+        QStandardPaths::PicturesLocation,
+        QStandardPaths::MoviesLocation
+    };
+
+    void buildMTPDirectories() {
+        mtpDirectories.clear();
+        foreach (const QStandardPaths::StandardLocation &standardLocation, mtpStandardLocations) {
+            QStringList locations = QStandardPaths::standardLocations(standardLocation);
+
+            foreach (const QString &location, locations) {
+                mtpDirectories << location;
+            }
+        }
+    }
 }
 
 
@@ -106,6 +127,7 @@
     , mIsRecursive(false)
     , mReadsMediaMetadata(false)
     , mShowHiddenFiles(false)
+    , mShowNonMTPPaths(true)
     , mSortBy(SortByName)
     , mSortOrder(SortAscending)
     , mCompareFunction(0)  
@@ -452,6 +474,28 @@
     }    
 }
 
+
+bool DirModel::isMTPPath(const QString &path) const {
+    if (mtpDirectories.isEmpty()) {
+        buildMTPDirectories();
+    }
+    foreach (const QString &mtpDirectory, mtpDirectories) {
+        if (path == mtpDirectory) return true;
+        // Returns true for any file/folder inside MTP directory
+        if (path.startsWith(mtpDirectory + "/")) return true;
+    }
+
+    return false;
+}
+
+bool DirModel::allowAccess(const DirItemInfo &fi) const {
+    return allowAccess(fi.absoluteFilePath());
+}
+
+bool DirModel::allowAccess(const QString &absoluteFilePath) const {
+    return mShowNonMTPPaths || isMTPPath(absoluteFilePath);
+}
+
 void DirModel::onItemsAdded(const DirItemInfoList &newFiles)
 {
 #if DEBUG_MESSAGES
@@ -463,6 +507,7 @@
         mDirectoryContents.reserve(newFiles.count()) ;
     }
     foreach (const DirItemInfo &fi, newFiles) {
+        if (!allowAccess(fi)) continue;
 
         bool doAdd = false;
         foreach (const QString &nameFilter, mNameFilters) {
@@ -483,6 +528,11 @@
 
 void DirModel::rm(const QStringList &paths)
 {
+    if (!allowAccess(mCurrentDir)) {
+        qDebug() << Q_FUNC_INFO << "Access denied in current path" << mCurrentDir;
+        return;
+    }
+
     //if current location is Trash only in the root is allowed to remove Items
     if (mCurLocation->type() == LocationsFactory::TrashDisk)
     {
@@ -509,13 +559,17 @@
 #if DEBUG_MESSAGES
     qDebug() << Q_FUNC_INFO << this << "Renaming " << row << " to " << newName;
 #endif
-
     if (!IS_VALID_ROW(row)) {
         WARN_ROW_OUT_OF_RANGE(row);
         return false;
     }
 
     const DirItemInfo &fi = mDirectoryContents.at(row);
+    if (!allowAccess(mCurrentDir)) {
+        qDebug() << Q_FUNC_INFO << "Access denied in current path" << mCurrentDir;
+        return false;
+    }
+
     QString newFullFilename(fi.absolutePath() + QDir::separator() + newName);
 
     //QFile::rename() works for File and Dir
@@ -539,6 +593,11 @@
 
 void DirModel::mkdir(const QString &newDir)
 {
+    if (!allowAccess(mCurrentDir)) {
+        qDebug() << Q_FUNC_INFO << "Access denied in current path" << mCurrentDir;
+        return;
+    }
+
     QDir dir(mCurrentDir);
     bool retval = dir.mkdir(newDir);
     if (!retval) {
@@ -748,12 +807,23 @@
 
 void DirModel::cutPaths(const QStringList &items)
 {
-     mClipboard->cut(items, mCurrentDir);
+    if (!allowAccess(mCurrentDir)) {
+        qDebug() << Q_FUNC_INFO << "Access denied in current path" << mCurrentDir;
+        return;
+    }
+
+    mClipboard->cut(items, mCurrentDir);
 }
 
 
 void DirModel::paste()
 {
+    // Restrict pasting if in restricted directory
+    if (!allowAccess(mCurrentDir)) {
+        qDebug() << Q_FUNC_INFO << "access not allowed, pasting not done" << mCurrentDir;
+        return;
+    }
+
     ClipboardOperation operation;
     QStringList items = mClipboard->paste(operation);
     if (operation == ClipboardCut)
@@ -886,6 +956,9 @@
  */
 int DirModel::addItem(const DirItemInfo &fi)
 {
+    if (!allowAccess(fi)) {
+        return -1;
+    }
     DirItemInfoList::Iterator it = qLowerBound(mDirectoryContents.begin(),
                                                   mDirectoryContents.end(),
                                                   fi,
@@ -990,6 +1063,22 @@
     }
 }
 
+bool DirModel::getShowNonMTPPaths() const
+{
+    return mShowNonMTPPaths;
+}
+
+
+void DirModel::setShowNonMTPPaths(bool show)
+{
+    if (show != mShowNonMTPPaths)
+    {
+        mShowNonMTPPaths = show;
+        refresh();
+        emit showNonMTPPathsChanged();
+    }
+}
+
 
 void DirModel::toggleShowDirectories()
 {

=== modified file 'src/plugin/folderlistmodel/dirmodel.h'
--- src/plugin/folderlistmodel/dirmodel.h	2014-06-17 21:41:59 +0000
+++ src/plugin/folderlistmodel/dirmodel.h	2014-08-07 20:04:19 +0000
@@ -179,6 +179,10 @@
     Q_PROPERTY(bool showHiddenFiles READ getShowHiddenFiles WRITE setShowHiddenFiles NOTIFY showHiddenFilesChanged)
     bool getShowHiddenFiles() const;
 
+    // IMPROVE: should be something like onlyMTPPaths (negation of current property) since this affects also deleting/creating directories/moving etc. modifying operations
+    Q_PROPERTY(bool showNonMTPPaths READ getShowNonMTPPaths WRITE setShowNonMTPPaths NOTIFY showNonMTPPathsChanged)
+    bool getShowNonMTPPaths() const;
+
     Q_ENUMS(SortBy)
     enum SortBy
     {
@@ -371,6 +375,7 @@
     void setFilterDirectories(bool filterDirectories);
     void setShowDirectories(bool showDirectories);
     void setShowHiddenFiles(bool show);
+    void setShowNonMTPPaths(bool show);
     void setSortBy(SortBy field);
     void setSortOrder(SortOrder order);
     void setEnabledExternalFSWatcher(bool enable);
@@ -402,6 +407,7 @@
     void     progress(int curItem, int totalItems, int percent);
 
     void     showHiddenFilesChanged();
+    void     showNonMTPPathsChanged();
     void     sortByChanged();
     void     sortOrderChanged();
     void     clipboardChanged();
@@ -442,6 +448,7 @@
 
 private:
     bool                mShowHiddenFiles;
+    bool                mShowNonMTPPaths;
     SortBy              mSortBy;
     SortOrder           mSortOrder;
     CompareFunction     mCompareFunction;
@@ -451,7 +458,6 @@
     LocationsFactory *  mLocationFactory;
     Location         *  mCurLocation;
 
-
 private:
     FileSystemAction  *  m_fsAction;  //!< it does file system recursive remove/copy/move
     QString  fileSize(qint64 size)  const;
@@ -466,6 +472,10 @@
     virtual QVariant  headerData(int section, Qt::Orientation orientation, int role) const;
     friend class TestDirModel;
 #endif
+
+    bool allowAccess(const DirItemInfo &fi) const;
+    bool allowAccess(const QString &path) const;
+    bool isMTPPath(const QString &path) const;
 };
 
 

=== added directory 'src/plugin/pamauthentication'
=== added file 'src/plugin/pamauthentication/CMakeLists.txt'
--- src/plugin/pamauthentication/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ src/plugin/pamauthentication/CMakeLists.txt	2014-08-07 20:04:19 +0000
@@ -0,0 +1,37 @@
+include_directories(
+    ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
+set(PLUGIN_DIR com/ubuntu/PamAuthentication)
+
+set(pamauthentication_SRCS
+    pamauthentication.cpp
+    pamauthentication.h
+    pamauthentication_plugin.cpp
+    pamauthentication_plugin.h
+)
+
+add_library(PamAuthentication MODULE
+    ${pamauthentication_SRCS}
+)
+
+target_link_libraries(PamAuthentication pam)
+
+qt5_use_modules(PamAuthentication Gui Qml Quick Widgets DBus)
+
+# Copy the plugin, the qmldir file and other assets to the build dir for running in QtCreator
+if(NOT "${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
+    add_custom_command(TARGET PamAuthentication POST_BUILD
+        COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/../${PLUGIN_DIR}
+        COMMENT "Creating plugin directory layout in the build directory"
+        COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/qmldir ${CMAKE_CURRENT_BINARY_DIR}/../${PLUGIN_DIR}
+        COMMENT "Copying the qmldir file to the build directory"
+        COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:PamAuthentication> ${CMAKE_CURRENT_BINARY_DIR}/../${PLUGIN_DIR}
+        COMMENT "Copying the plugin binary to the build directory"
+    )
+endif(NOT "${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
+
+# Install plugin file
+install(TARGETS PamAuthentication DESTINATION ${QT_IMPORTS_DIR}/${PLUGIN_DIR})
+install(FILES qmldir DESTINATION ${QT_IMPORTS_DIR}/${PLUGIN_DIR})
+

=== added file 'src/plugin/pamauthentication/pamauthentication.cpp'
--- src/plugin/pamauthentication/pamauthentication.cpp	1970-01-01 00:00:00 +0000
+++ src/plugin/pamauthentication/pamauthentication.cpp	2014-08-07 20:04:19 +0000
@@ -0,0 +1,153 @@
+/*
+ * Copyright (C) 2014 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author : Arto Jalkanen <[e-mail]>
+ */
+
+#include "pamauthentication.h"
+
+#include <QDebug>
+#include <QtDBus/QtDBus>
+
+#include <security/pam_appl.h>
+
+#define UNITYGREETER_SERVICE "com.canonical.UnityGreeter"
+#define UNITYGREETER_PATH "/list"
+#define UNITYGREETER_INTERFACE "com.canonical.UnityGreeter.List"
+#define UNITYGREETER_PROPERTY_ENTRY_IS_LOCKED "EntryIsLocked"
+
+
+PamAuthentication::PamAuthentication(QObject *parent) :
+    QObject(parent)
+{
+    m_userLogin = qgetenv("USER");
+}
+
+PamAuthentication::~PamAuthentication() {
+
+}
+
+void
+PamAuthentication::setServiceName(const QString &serviceName) {
+    if (serviceName != m_serviceName) {
+        m_serviceName = serviceName;
+        emit serviceNameChanged();
+    }
+}
+
+bool
+PamAuthentication::requireAuthentication() {
+    QDBusInterface dbus_iface(UNITYGREETER_SERVICE, UNITYGREETER_PATH, UNITYGREETER_INTERFACE);
+
+    qDebug() << Q_FUNC_INFO << "Querying if authentication required";
+
+    if (!dbus_iface.isValid()) {
+        qDebug() << Q_FUNC_INFO << "Not a valid dbus interface";
+        qDebug() << Q_FUNC_INFO << "Last error: " + dbus_iface.lastError().message();
+        // By default be cautious and require authentication
+        return true;
+    }
+    QVariant isLockedVariant = dbus_iface.property(UNITYGREETER_PROPERTY_ENTRY_IS_LOCKED);
+    if (isLockedVariant.isValid()) {
+        bool replyValue = isLockedVariant.toBool();
+        qDebug() << Q_FUNC_INFO << "Return value" << replyValue;
+        return isLockedVariant.toBool();
+    } else {
+        qDebug() << Q_FUNC_INFO << "Failed getting value for EntryIsLocked property";
+    }
+    // By default be cautious and require authentication
+    return true;
+}
+
+bool
+PamAuthentication::validatePasswordToken(const QString &token) {
+    pam_handle *pamHandle = 0;
+    if (!initPam(&pamHandle)) {
+        qDebug() << Q_FUNC_INFO << "Pam init failed";
+        return false;
+    }
+
+    m_passwordToken = token;
+
+    int status = pam_authenticate(pamHandle, 0);
+    qDebug() << Q_FUNC_INFO << "Pam authenticate status" << status;
+
+    pam_end(pamHandle, status);
+
+    m_passwordToken.clear();
+
+    return status == PAM_SUCCESS;
+}
+
+bool
+PamAuthentication::initPam(pam_handle **pamHandle)
+{
+    pam_conv conversation;
+    conversation.conv = ConversationFunction;
+    conversation.appdata_ptr = static_cast<void *>(this);
+
+    return pam_start(m_serviceName.toLatin1().data(), m_userLogin.toLatin1().data(),
+                     &conversation, pamHandle) == PAM_SUCCESS;
+}
+
+int PamAuthentication::ConversationFunction(int num_msg,
+                                            const pam_message **msg,
+                                            pam_response **resp,
+                                            void* appdata_ptr)
+{
+    if (num_msg <= 0) {
+        return PAM_CONV_ERR;
+    }
+
+    *resp = static_cast<pam_response*>(calloc(num_msg, sizeof(pam_response)));
+
+    PamAuthentication *self = static_cast<PamAuthentication*>(appdata_ptr);
+
+    for (int count = 0; count < num_msg; ++count) {
+        switch (msg[count]->msg_style) {
+        case PAM_PROMPT_ECHO_ON:
+        {
+            qDebug() << Q_FUNC_INFO << "PAM_PROMPT_ECHO_ON received";
+            resp[count]->resp = strdup(self->m_passwordToken.toLatin1().data());
+            resp[count]->resp_retcode = 0;
+            break;
+        }
+        case PAM_PROMPT_ECHO_OFF:
+        {
+            qDebug() << Q_FUNC_INFO << "PAM_PROMPT_ECHO_OFF received";
+            resp[count]->resp = strdup(self->m_passwordToken.toLatin1().data());
+            resp[count]->resp_retcode = 0;
+            break;
+        }
+        case PAM_TEXT_INFO:
+        {
+            QString message(msg[count]->msg);
+            qDebug() << Q_FUNC_INFO << "PAM_TEXT_INFO received" << message;
+            break;
+        }
+        case PAM_AUTHTOK:
+        {
+            qDebug() << Q_FUNC_INFO << "PAM_AUTHTOK received";
+            break;
+        }
+        default:
+        {
+            qDebug() << Q_FUNC_INFO << "Other PAM msg received: " << msg[count]->msg_style;
+        }
+        }
+    }
+
+    return PAM_SUCCESS;
+}

=== added file 'src/plugin/pamauthentication/pamauthentication.h'
--- src/plugin/pamauthentication/pamauthentication.h	1970-01-01 00:00:00 +0000
+++ src/plugin/pamauthentication/pamauthentication.h	2014-08-07 20:04:19 +0000
@@ -0,0 +1,71 @@
+/*
+ * Copyright (C) 2014 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author : Arto Jalkanen <[e-mail]>
+ */
+
+#ifndef PAMAUTHENTICATION_H
+#define PAMAUTHENTICATION_H
+
+#include <QObject>
+#include <QAbstractListModel>
+#include <QStandardPaths>
+#include <QSettings>
+
+// Forward declarations
+struct pam_handle;
+struct pam_message;
+struct pam_response;
+
+// TODO: documentation
+class PamAuthentication : public QObject
+{
+    Q_OBJECT
+
+public:
+    explicit PamAuthentication(QObject *parent = 0);
+    ~PamAuthentication();
+
+    Q_INVOKABLE bool requireAuthentication();
+
+    Q_INVOKABLE bool validatePasswordToken(const QString &token);
+
+    Q_PROPERTY(QString serviceName READ serviceName WRITE setServiceName NOTIFY serviceNameChanged)
+    inline const QString &serviceName() const {
+        return m_serviceName;
+    }
+
+    void setServiceName(const QString &serviceName);
+signals:
+    void serviceNameChanged();
+
+public slots:
+private:
+    static int ConversationFunction(int num_msg,
+                                    const pam_message** msg,
+                                    pam_response** resp,
+                                    void* appdata_ptr);
+
+    bool initPam(pam_handle **pamHandle);
+
+    QString m_passwordToken;
+    QString m_serviceName;
+    QString m_userLogin;
+};
+
+#endif // PAMAUTHENTICATION_H
+
+
+

=== added file 'src/plugin/pamauthentication/pamauthentication_plugin.cpp'
--- src/plugin/pamauthentication/pamauthentication_plugin.cpp	1970-01-01 00:00:00 +0000
+++ src/plugin/pamauthentication/pamauthentication_plugin.cpp	2014-08-07 20:04:19 +0000
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2014 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author : Arto Jalkanen <[e-mail]>
+ */
+
+#include <QtQml>
+#include <QtQml/QQmlContext>
+#include "pamauthentication_plugin.h"
+#include "pamauthentication.h"
+
+void BackendPlugin::registerTypes(const char *uri)
+{
+    Q_ASSERT(uri == QLatin1String(QUOTES(PLUGIN_URI)));
+
+    qmlRegisterType<PamAuthentication>(uri, 0, 1, "PamAuthentication");
+}
+
+void BackendPlugin::initializeEngine(QQmlEngine *engine, const char *uri)
+{
+    QQmlExtensionPlugin::initializeEngine(engine, uri);
+}

=== added file 'src/plugin/pamauthentication/pamauthentication_plugin.h'
--- src/plugin/pamauthentication/pamauthentication_plugin.h	1970-01-01 00:00:00 +0000
+++ src/plugin/pamauthentication/pamauthentication_plugin.h	2014-08-07 20:04:19 +0000
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2014 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author : Arto Jalkanen <[e-mail]>
+ */
+
+#ifndef PAMAUTHENTICATION_PLUGIN_H
+#define PAMAUTHENTICATION_PLUGIN_H
+
+#include <QtQml/QQmlEngine>
+#include <QtQml/QQmlExtensionPlugin>
+
+class BackendPlugin : public QQmlExtensionPlugin
+{
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
+
+public:
+    void registerTypes(const char *uri);
+    void initializeEngine(QQmlEngine *engine, const char *uri);
+};
+#endif // PAMAUTHENTICATION_PLUGIN_H
+
+
+
+
+

=== added file 'src/plugin/pamauthentication/qmldir'
--- src/plugin/pamauthentication/qmldir	1970-01-01 00:00:00 +0000
+++ src/plugin/pamauthentication/qmldir	2014-08-07 20:04:19 +0000
@@ -0,0 +1,2 @@
+module com.ubuntu.PamAuthentication
+plugin PamAuthentication

=== modified file 'ubuntu-filemanager-app.json'
--- ubuntu-filemanager-app.json	2014-05-13 19:46:32 +0000
+++ ubuntu-filemanager-app.json	2014-08-07 20:04:19 +0000
@@ -5,4 +5,4 @@
         "content_exchange"
     ],
     "policy_version": 1
-}
+}
\ No newline at end of file