Merge into trunk : pasteboard : Code : content-hub

Reviewer	Review Type	Date Requested	Status
Tyler Hicks			Approve on 2016-08-25
system-apps-ci-bot	continuous-integration		Needs Fixing on 2016-08-25
Daniel d'Andrada (community)		2016-06-02	Approve on 2016-08-03
PS Jenkins bot	continuous-integration		Pending
Review via email: mp+296352@code.launchpad.net

Revision history for this message

system-apps-ci-bot (system-apps-ci-bot) wrote on 2016-06-14:

#

FAILED: Continuous integration, rev:286
https://jenkins.canonical.com/system-apps/job/lp-content-hub-ci/2/
Executed test runs:
FAILURE: https://jenkins.canonical.com/system-apps/job/build/563/console
FAILURE: https://jenkins.canonical.com/system-apps/job/build-0-fetch/563/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-content-hub-ci/2/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

system-apps-ci-bot (system-apps-ci-bot) wrote on 2016-07-08:

#

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-content-hub-ci/20/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

system-apps-ci-bot (system-apps-ci-bot) wrote on 2016-07-08:

#

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-content-hub-ci/22/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

system-apps-ci-bot (system-apps-ci-bot) wrote on 2016-07-18:

#

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-content-hub-ci/24/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

system-apps-ci-bot (system-apps-ci-bot) wrote on 2016-07-18:

#

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-content-hub-ci/25/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Daniel d'Andrada (dandrader) wrote on 2016-07-18:

#

In include/com/ubuntu/content/hub.h:

"""
Q_INVOKABLE virtual Paste* create_paste(const QMimeData& data);
"""

Who owns the created Paste object? Is the caller free to delete it? Will that Paste object live forever, as long as Hub does? Please document it (I know other methods are undocumented and that sucks).

--------------------------------------------------

In include/com/ubuntu/content/paste.h:

Since Paste is public API, I would like to see it documented. Again, I know existing the API isn't, but we can do better than that.

"""
#include <com/ubuntu/content/item.h>
"""

What do you use from this header?

"""
namespace com
{
namespace ubuntu
{
namespace content
{
namespace detail
{
}
}
}
}
"""

You can remove this as you don't forward-declare anything in there.

"""
Q_PROPERTY(int id READ id)
[...]
Q_PROPERTY(QString source READ source)
"""

If those properties never change you should declare them as CONSTANT, like this:
Q_PROPERTY(QString source READ source CONSTANT)

"""
    enum State
    {
        created,
        charged,
        saved,
        collected
    };
"""

What do those states mean and why should user the care about them all?

"""
    Q_INVOKABLE virtual int id() const;
    Q_INVOKABLE virtual State state() const;
    Q_INVOKABLE virtual bool charge(const QMimeData& mimeData);
    Q_INVOKABLE virtual QMimeData* mimeData();
    Q_INVOKABLE virtual QString source() const;
"""

They don't have to (nor should) be Q_INVOKABLE if they're already getters or setters of Q_PROPERTIES. You added the Q_INVOKABLE so they could be called from QML, right?

"""
//Q_PROPERTY(QMimeData mimeData READ mimeData WRITE charge)
"""

Why commented out?

"""
Q_INVOKABLE virtual bool charge(const QMimeData& mimeData);
"""

Is the user supposed to call this? What's the use case? He can call Hub::create_paste(mimeData) and later change the paste contents passing a different QMimeData?

What's the use of Paste::source property?

review: Needs Information

Revision history for this message

Daniel d'Andrada (dandrader) wrote on 2016-07-19:

#

"""
Q_INVOKABLE virtual const QMimeData* latest_paste_buf();
"""

That usually involves a round-trip through the D-Bus session + deserialization of the QMimeData, right?

So if I (the client) wanna get it asynchronously to avoid blocking my current thread (essentially because of the IPC involved), should I call this method from a separate worker thread? Or would it be simple for you to expose an async version of this on the client API?

review: Needs Information

Revision history for this message

Daniel d'Andrada (dandrader) wrote on 2016-07-19:

#

Hub is missing a signal to inform clients that the clibboard content has changed.

review: Needs Fixing

Revision history for this message

Ken VanDine (ken-vandine) wrote on 2016-07-20:

#

Download full text (3.2 KiB)

> In include/com/ubuntu/content/hub.h:
>
> """
> Q_INVOKABLE virtual Paste* create_paste(const QMimeData& data);
> """
>
> Who owns the created Paste object? Is the caller free to delete it? Will that
> Paste object live forever, as long as Hub does? Please document it (I know
> other methods are undocumented and that sucks).

Caller is free to delete it. The object will be available as long as the hub is running. Eventually we'll cache them to disk as well, so the stack will be restored.

>
> --------------------------------------------------
>
> In include/com/ubuntu/content/paste.h:
>
> Since Paste is public API, I would like to see it documented. Again, I know
> existing the API isn't, but we can do better than that.

Paste is technically a public API, but applications won't have direct access to the Paste object under confinement. Which reminds me why create_paste shouldn't return the Paste object. That should really just return a boolean. The Paste object will be used for the clipboard app.

>
> """
> #include <com/ubuntu/content/item.h>
> """
>
> What do you use from this header?

That can be removed

>
> """
> namespace com
> {
> namespace ubuntu
> {
> namespace content
> {
> namespace detail
> {
> }
> }
> }
> }
> """
>
> You can remove this as you don't forward-declare anything in there.
>
> """
> Q_PROPERTY(int id READ id)
> [...]
> Q_PROPERTY(QString source READ source)
> """
>
> If those properties never change you should declare them as CONSTANT, like
> this:
> Q_PROPERTY(QString source READ source CONSTANT)

Agreed, that would be better

>
> """
> enum State
> {
> created,
> charged,
> saved,
> collected
> };
> """
>
> What do those states mean and why should user the care about them all?

The user probably doesn't care, and we might just blow away the state property.

>
>
> """
> Q_INVOKABLE virtual int id() const;
> Q_INVOKABLE virtual State state() const;
> Q_INVOKABLE virtual bool charge(const QMimeData& mimeData);
> Q_INVOKABLE virtual QMimeData* mimeData();
> Q_INVOKABLE virtual QString source() const;
> """
>
> They don't have to (nor should) be Q_INVOKABLE if they're already getters or
> setters of Q_PROPERTIES. You added the Q_INVOKABLE so they could be called
> from QML, right?

Yes, although we probably only need the charge method to be callable from QML.

>
>
> """
> //Q_PROPERTY(QMimeData mimeData READ mimeData WRITE charge)
> """
>
> Why commented out?

I don't see this commented out, maybe you reviewed this before my last push.

>
> """
> Q_INVOKABLE virtual bool charge(const QMimeData& mimeData);
> """
>
> Is the user supposed to call this? What's the use case? He can call
> Hub::create_paste(mimeData) and later change the paste contents passing a
> different QMimeData?

Not directly, this is for use by the hub. Once the Paste object is charged, it can no longer be charged again. So the data won't change. For qtubuntu, you should only use the API exposed by hub.h.

>
> What's the use of Paste::source property?

This is the appId of the application that created the paste. We'll use this in the...

> In include/com/ubuntu/content/hub.h:
> 
> """
>     Q_INVOKABLE virtual Paste* create_paste(const QMimeData& data);
> """
> 
> Who owns the created Paste object? Is the caller free to delete it? Will that
> Paste object live forever, as long as Hub does? Please document it (I know
> other methods are undocumented and that sucks).

Caller is free to delete it.  The object will be available as long as the hub is running.  Eventually we'll cache them to disk as well, so the stack will be restored.

> 
> --------------------------------------------------
> 
> In include/com/ubuntu/content/paste.h:
> 
> Since Paste is public API, I would like to see it documented. Again, I know
> existing the API isn't, but we can do better than that.

Paste is technically a public API, but applications won't have direct access to the Paste object under confinement.  Which reminds me why create_paste shouldn't return the Paste object.  That should really just return a boolean.  The Paste object will be used for the clipboard app.

> 
> """
> #include <com/ubuntu/content/item.h>
> """
> 
> What do you use from this header?

That can be removed

> 
> """
> namespace com
> {
> namespace ubuntu
> {
> namespace content
> {
> namespace detail
> {
> }
> }
> }
> }
> """
> 
> You can remove this as you don't forward-declare anything in there.
> 
> """
>     Q_PROPERTY(int id READ id)
> [...]
>     Q_PROPERTY(QString source READ source)
> """
> 
> If those properties never change you should declare them as CONSTANT, like
> this:
> Q_PROPERTY(QString source READ source CONSTANT)

Agreed, that would be better

> 
> """
>     enum State
>     {
>         created,
>         charged,
>         saved,
>         collected
>     };
> """
> 
> What do those states mean and why should user the care about them all?

The user probably doesn't care, and we might just blow away the state property.

> 
> 
> """
>     Q_INVOKABLE virtual int id() const;
>     Q_INVOKABLE virtual State state() const;
>     Q_INVOKABLE virtual bool charge(const QMimeData&  mimeData);
>     Q_INVOKABLE virtual QMimeData* mimeData();
>     Q_INVOKABLE virtual QString source() const;
> """
> 
> They don't have to (nor should) be Q_INVOKABLE if they're already getters or
> setters of Q_PROPERTIES. You added the Q_INVOKABLE so they could be called
> from QML, right?

Yes, although we probably only need the charge method to be callable from QML.

> 
> 
> """
>     //Q_PROPERTY(QMimeData mimeData READ mimeData WRITE charge)
> """
> 
> Why commented out?

I don't see this commented out, maybe you reviewed this before my last push.

> 
> """
>     Q_INVOKABLE virtual bool charge(const QMimeData&  mimeData);
> """
> 
> Is the user supposed to call this? What's the use case? He can call
> Hub::create_paste(mimeData) and later change the paste contents passing a
> different QMimeData?

Not directly, this is for use by the hub.  Once the Paste object is charged, it can no longer be charged again.  So the data won't change.  For qtubuntu, you should only use the API exposed by hub.h.

> 
> What's the use of Paste::source property?

This is the appId of the application that created the paste.  We'll use this in the clipboard app to show the application icon next to the item in the stack.

Revision history for this message

Ken VanDine (ken-vandine) wrote on 2016-07-20:

#

> Hub is missing a signal to inform clients that the clibboard content has
> changed.

I'm adding property that returns a list of mimetypes on the stack which includes a changed signal.

Revision history for this message

system-apps-ci-bot (system-apps-ci-bot) wrote on 2016-07-21:

#

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-content-hub-ci/26/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

system-apps-ci-bot (system-apps-ci-bot) wrote on 2016-07-21:

#

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-content-hub-ci/27/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

system-apps-ci-bot (system-apps-ci-bot) wrote on 2016-07-21:

#

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-content-hub-ci/28/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

system-apps-ci-bot (system-apps-ci-bot) wrote on 2016-07-21:

#

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-content-hub-ci/29/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

system-apps-ci-bot (system-apps-ci-bot) wrote on 2016-07-21:

#

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-content-hub-ci/30/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

system-apps-ci-bot (system-apps-ci-bot) wrote on 2016-07-25:

#

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-content-hub-ci/31/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Daniel d'Andrada (dandrader) wrote on 2016-07-26:

#

Made some modifications here:
http://bazaar.launchpad.net/~dandrader/content-hub/pasteboard/revision/285

- Fix unnecessary round trip and memory leak when fetching a Paste from the service
- Simplify D-Bus interface and traffic using ay instead of av
- Create separate sync and async versions of createPaste

Revision history for this message

Daniel d'Andrada (dandrader) wrote on 2016-07-26:

#

Code making use of it is here:
lp:~dandrader/qtubuntu/content-hub-clipboard

In src/ubuntumirclient/clipboard.cpp

Revision history for this message

Daniel d'Andrada (dandrader) wrote on 2016-07-26:

#

> Made some modifications here:
> http://bazaar.launchpad.net/~dandrader/content-hub/pasteboard/revision/285
>
> - Fix unnecessary round trip and memory leak when fetching a Paste from the
> service
> - Simplify D-Bus interface and traffic using ay instead of av
> - Create separate sync and async versions of createPaste

Oh, and added async versions for latestPaste() and pasteById() as well.

Revision history for this message

Ken VanDine (ken-vandine) wrote on 2016-07-26:

#

> > Made some modifications here:
> > http://bazaar.launchpad.net/~dandrader/content-hub/pasteboard/revision/285
> >
> > - Fix unnecessary round trip and memory leak when fetching a Paste from the
> > service
> > - Simplify D-Bus interface and traffic using ay instead of av
> > - Create separate sync and async versions of createPaste
>
> Oh, and added async versions for latestPaste() and pasteById() as well.

These changes are great! Only comment I have is I prefer making createPaste async and making the sync version something like createPasteSync. Makes it feel like the preferred function is the async one. But that's not a must for me, it's just more like I'm used to doing with gobject style code. What do you think is more common for Qt?

Revision history for this message

Daniel d'Andrada (dandrader) wrote on 2016-07-26:

#

On 26/07/2016 18:05, Ken VanDine wrote:
>>> Made some modifications here:
>>> http://bazaar.launchpad.net/~dandrader/content-hub/pasteboard/revision/285
>>>
>>> - Fix unnecessary round trip and memory leak when fetching a Paste from the
>>> service
>>> - Simplify D-Bus interface and traffic using ay instead of av
>>> - Create separate sync and async versions of createPaste
>> Oh, and added async versions for latestPaste() and pasteById() as well.
> These changes are great! Only comment I have is I prefer making createPaste async and making the sync version something like createPasteSync. Makes it feel like the preferred function is the async one. But that's not a must for me, it's just more like I'm used to doing with gobject style code. What do you think is more common for Qt?

I followed the convention used here:
http://doc.qt.io/qt-5/qdbusabstractinterface.html#public-functions

But I also prefer prefer the way you suggest. Made the change (same
revision number).

Revision history for this message

system-apps-ci-bot (system-apps-ci-bot) wrote on 2016-07-27:

#

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-content-hub-ci/32/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

system-apps-ci-bot (system-apps-ci-bot) wrote on 2016-07-27:

#

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-content-hub-ci/33/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

system-apps-ci-bot (system-apps-ci-bot) wrote on 2016-07-29:

#

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-content-hub-ci/36/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

system-apps-ci-bot (system-apps-ci-bot) wrote on 2016-07-29:

#

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-content-hub-ci/37/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

system-apps-ci-bot (system-apps-ci-bot) wrote on 2016-07-29:

#

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-content-hub-ci/38/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

system-apps-ci-bot (system-apps-ci-bot) wrote on 2016-07-29:

#

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-content-hub-ci/39/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

system-apps-ci-bot (system-apps-ci-bot) wrote on 2016-08-01:

#

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-content-hub-ci/40/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

system-apps-ci-bot (system-apps-ci-bot) wrote on 2016-08-01:

#

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-content-hub-ci/41/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

system-apps-ci-bot (system-apps-ci-bot) wrote on 2016-08-01:

#

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-content-hub-ci/42/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Daniel d'Andrada (dandrader) wrote on 2016-08-01:

#

Looks good to me.

review: Approve

Revision history for this message

Daniel d'Andrada (dandrader) wrote on 2016-08-01:

#

CMakeLists.txt:79:set(CONTENT_HUB_VERSION_MAJOR 0)
CMakeLists.txt:80:set(CONTENT_HUB_VERSION_MINOR 0)
CMakeLists.txt:81:set(CONTENT_HUB_VERSION_PATCH 1)

Please update those to match the version in debian/changelog.

Otherwise things like that will fail:
pkg_check_modules(CONTENT_HUB libcontent-hub>=0.2 REQUIRED)

review: Needs Fixing

Revision history for this message

Daniel d'Andrada (dandrader) wrote on 2016-08-01:

#

CMakeLists.txt:79:set(CONTENT_HUB_VERSION_MAJOR 0)
CMakeLists.txt:80:set(CONTENT_HUB_VERSION_MINOR 0)
CMakeLists.txt:81:set(CONTENT_HUB_VERSION_PATCH 1)

Please update those to match the version in debian/changelog.

Otherwise things like that will fail:
pkg_check_modules(CONTENT_HUB libcontent-hub>=0.2 REQUIRED)

review: Needs Fixing

Revision history for this message

Daniel d'Andrada (dandrader) wrote on 2016-08-01:

#

Would be good also to move over the test for the serialization and deserialization code from lp:qtmir in tests/mirserver/Clipboard/clipboard_test.cpp.

Namely TEST(ClipboardTest, MimeDataSerialization)

Revision history for this message

Daniel d'Andrada (dandrader) wrote on 2016-08-01:

#

Made some changes in lp:~dandrader/content-hub/pasteboard revision 285. Let me know what you think.

It was really annoying me while testing on a laptop that content-hub was refusing to accept a copy from an app that unity8 was displaying (because ubuntu-app-launch wasn't tracking the running app for some reason). That cannot happen and would be a regression since it works with the current clipboard implementation.

Revision history for this message

system-apps-ci-bot (system-apps-ci-bot) wrote on 2016-08-03:

#

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-content-hub-ci/43/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Ken VanDine (ken-vandine) wrote on 2016-08-03:

#

> CMakeLists.txt:79:set(CONTENT_HUB_VERSION_MAJOR 0)
> CMakeLists.txt:80:set(CONTENT_HUB_VERSION_MINOR 0)
> CMakeLists.txt:81:set(CONTENT_HUB_VERSION_PATCH 1)
>
> Please update those to match the version in debian/changelog.
>
> Otherwise things like that will fail:
> pkg_check_modules(CONTENT_HUB libcontent-hub>=0.2 REQUIRED)

Done

Revision history for this message

Ken VanDine (ken-vandine) wrote on 2016-08-03:

#

> Would be good also to move over the test for the serialization and
> deserialization code from lp:qtmir in
> tests/mirserver/Clipboard/clipboard_test.cpp.
>
> Namely TEST(ClipboardTest, MimeDataSerialization)

Done

Revision history for this message

system-apps-ci-bot (system-apps-ci-bot) wrote on 2016-08-03:

#

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-content-hub-ci/44/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Ken VanDine (ken-vandine) wrote on 2016-08-03:

#

> Made some changes in lp:~dandrader/content-hub/pasteboard revision 285. Let me
> know what you think.
>
> It was really annoying me while testing on a laptop that content-hub was
> refusing to accept a copy from an app that unity8 was displaying (because
> ubuntu-app-launch wasn't tracking the running app for some reason). That
> cannot happen and would be a regression since it works with the current
> clipboard implementation.

This is fine, ultimately I hope it'll be a real corner case. But it's really not that big of a deal if it fails.

Revision history for this message

Daniel d'Andrada (dandrader) wrote on 2016-08-03:

#

Thanks!

review: Approve

Revision history for this message

system-apps-ci-bot (system-apps-ci-bot) wrote on 2016-08-03:

#

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-content-hub-ci/45/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Tyler Hicks (tyhicks) wrote on 2016-08-03:

#

Ubuntu Security would like to review this change. We were involved in the early design stages and were awaiting an update to the design doc for this feature. The design doc that we have access to is still based on an old design that doesn't match this implementation. We're blocked until the doc can be updated.

review: Needs Information

Revision history for this message

Daniel d'Andrada (dandrader) wrote on 2016-08-23:

#

Wrote focused surface verification based on persistent surface ids here:
http://bazaar.launchpad.net/~dandrader/content-hub/pasteboard/revision/315

lp:~ken-vandine/content-hub/pasteboard updated on 2016-08-24

315. By Ken VanDine on 2016-08-24: merged trunk
316. By Ken VanDine on 2016-08-24: Daniel d'Andrada 2016-08-23 Authenticate using surface ids instead of process ids

Revision history for this message

system-apps-ci-bot (system-apps-ci-bot) wrote on 2016-08-24:

#

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-content-hub-ci/46/rebuild

FAILED: Continuous integration, rev:316
https://jenkins.canonical.com/system-apps/job/lp-content-hub-ci/46/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/1286/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/1286
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=vivid+overlay/1152
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=xenial+overlay/1152
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=yakkety/1152
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1135
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1135/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1135
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1135/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1135/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1135
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1135/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1135
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1135/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1135
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1135/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1135
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1135/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1135
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1135/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1135
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1135/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-content-hub-ci/46/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Daniel d'Andrada (dandrader) wrote on 2016-08-24:

#

The client is blocking on startup waiting for PasteFormats value.

Wrote a fix for it here:
http://bazaar.launchpad.net/~dandrader/content-hub/pasteboard/revision/317

There I've also reduced D-Bus round trips by already sending the paste formats on its changed signal.

lp:~ken-vandine/content-hub/pasteboard updated on 2016-08-25

317. By Ken VanDine on 2016-08-25: Daniel d'Andrada 2016-08-24 Improve PasteFormatsChanged

Revision history for this message

system-apps-ci-bot (system-apps-ci-bot) wrote on 2016-08-25:

#

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-content-hub-ci/48/rebuild

FAILED: Continuous integration, rev:317
https://jenkins.canonical.com/system-apps/job/lp-content-hub-ci/48/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/1314/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/1314
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=vivid+overlay/1178
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=xenial+overlay/1178
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=yakkety/1178
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1158
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1158/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1158
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1158/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1158/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1158
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1158/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1158
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1158/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1158
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1158/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1158
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1158/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1158
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1158/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1158/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-content-hub-ci/48/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Tyler Hicks (tyhicks) wrote on 2016-08-25:

#

I gave this a quick review. It was more of a design review than a detailed code review.

The security of this design is rooted in the random surface ID created by Mir. That surface ID must be randomly generated and of significant size so that bruteforces of the ID is not feasible. I'm told that the ID is randomly generated and evenly distributed throughout a full 128 bits. That should be sufficient.

A future improvement that I'd like to see is a penalty after a number of incorrect surface ID guesses so that a malicious app cannot simply brute force the 128 bit space without any negative side effects. The penalty could be time based, where the pasteboard doesn't return back for several seconds. There are other options, as well.

I had some trouble understanding the intent behind the usage of the APP_ID in the merge proposal. Ken tells me that it is for a future design when there is a pasteboard UI so that the user will be prompted with the APP_ID of the application requesting access to the paste buffer. Since the APP_ID isn't used right now, I'm not concerned, but I'd like to understand more about how the APP_ID is being retrieved before we start prompting users. I'd prefer that we use the APP_ID directly from the D-Bus daemon via the GetConnectionCredentials bus method:

https://dbus.freedesktop.org/doc/dbus-specification.html#bus-messages-get-connection-credentials

Thanks for working towards a secure copy and paste solution. I look forward to this design being improved on in the future with the introduction of a pasteboard UI.

review: Approve

Revision history for this message

Tyler Hicks (tyhicks) wrote on 2016-08-25:

#

Upon thinking about my suggestion, for a future enhancement, of a penalty to be handed out upon a number of wrong surface ID guesses, I realized that content-hub is not the correct place to implement the penalty. Mir clients will be able to call isSurfaceFocused() themselves to brute force the surface ID. Once they find a valid surface ID, then they can simply pass that to the content-hub. Therefore, the penalty mechanism would need to be implemented in Mir itself.

content-hub

Merge lp:~ken-vandine/content-hub/pasteboard into lp:content-hub

Commit message

Description of the change

Preview Diff

Subscribers

 === modified file 'CMakeLists.txt'
 --- CMakeLists.txt	2015-09-23 14:45:09 +0000
 +++ CMakeLists.txt	2016-08-25 13:22:47 +0000
@@ -24,8 +24,8 @@
  include (EnableCoverageReport)
  include (GSettings)
--set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror -Wall -pedantic -Wextra -fPIC -pthread")
--set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Werror -Wall -fno-strict-aliasing -pedantic -Wextra -fPIC -pthread -Wno-unused-function")
++set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC -pthread")
++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fno-strict-aliasing -fPIC -pthread -Wno-unused-function")
  set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined")
  # Workaround for libexecdir on debian
@@ -77,8 +77,8 @@
  add_definitions(-DI18N_DOMAIN="${GETTEXT_PACKAGE}")
  set(CONTENT_HUB_VERSION_MAJOR 0)
--set(CONTENT_HUB_VERSION_MINOR 0)
--set(CONTENT_HUB_VERSION_PATCH 1)
++set(CONTENT_HUB_VERSION_MINOR 2)
++set(CONTENT_HUB_VERSION_PATCH 0)
  set(CONTENT_HUB_VERSION "${CONTENT_HUB_VERSION_MAJOR}.${CONTENT_HUB_VERSION_MINOR}.${CONTENT_HUB_VERSION_PATCH}")
  set(QML_API_VERSION_MAJOR 1)
 === modified file 'debian/changelog'
 --- debian/changelog	2016-08-22 17:01:38 +0000
 +++ debian/changelog	2016-08-25 13:22:47 +0000
@@ -1,9 +1,18 @@
++<<<<<<< TREE
  content-hub (0.1+16.10.20160822-0ubuntu1) yakkety; urgency=medium
    * No change rebuild for UAL ABI change
   -- Ted Gould <ted@gould.cx>  Mon, 22 Aug 2016 17:01:38 +0000
++=======
++content-hub (0.2-0ubuntu1) UNRELEASED; urgency=medium
++
++  * Pasteboard implementation
++
++ -- Ken VanDine <ken.vandine@canonical.com>  Wed, 27 Jul 2016 10:49:05 -0400
++
++>>>>>>> MERGE-SOURCE
  content-hub (0.1+16.10.20160809-0ubuntu1) yakkety; urgency=medium
    * build dep on qttools5-dev-tools for qdoc
 === modified file 'examples/CMakeLists.txt'
 --- examples/CMakeLists.txt	2013-08-27 22:15:29 +0000
 +++ examples/CMakeLists.txt	2016-08-25 13:22:47 +0000
@@ -16,3 +16,4 @@
  add_subdirectory(importer)
  add_subdirectory(exporter)
++add_subdirectory(pasteboard)
 === added directory 'examples/pasteboard'
 === added file 'examples/pasteboard/CMakeLists.txt'
 --- examples/pasteboard/CMakeLists.txt	1970-01-01 00:00:00 +0000
 +++ examples/pasteboard/CMakeLists.txt	2016-08-25 13:22:47 +0000
@@ -0,0 +1,55 @@
++# Copyright © 2016 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: Ken VanDine <ken.vandine@canonical.com>
++
++include_directories(${CMAKE_CURRENT_BINARY_DIR})
++
++add_executable(
++  copy-to-pasteboard
++
++  copy.cpp
++)
++
++qt5_use_modules(copy-to-pasteboard Core Gui DBus)
++
++set_target_properties(
++  copy-to-pasteboard
++  PROPERTIES
++  AUTOMOC TRUE
++)
++
++target_link_libraries(
++  copy-to-pasteboard
++  content-hub
++)
++
++add_executable(
++  paste-from-pasteboard
++
++  paste.cpp
++)
++
++qt5_use_modules(paste-from-pasteboard Core Gui DBus)
++
++set_target_properties(
++  paste-from-pasteboard
++  PROPERTIES
++  AUTOMOC TRUE
++)
++
++target_link_libraries(
++  paste-from-pasteboard
++  content-hub
++)
 === added file 'examples/pasteboard/copy.cpp'
 --- examples/pasteboard/copy.cpp	1970-01-01 00:00:00 +0000
 +++ examples/pasteboard/copy.cpp	2016-08-25 13:22:47 +0000
@@ -0,0 +1,56 @@
++/*
++ * Copyright (C) 2016 Canonical, Ltd.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * 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: Ken VanDine <ken.vandine@canonical.com>
++ */
++
++#include <QCoreApplication>
++#include <QDebug>
++#include <QStringList>
++#include <com/ubuntu/content/hub.h>
++#include <com/ubuntu/content/paste.h>
++
++namespace cuc = com::ubuntu::content;
++
++int main(int argc, char *argv[])
++{
++    QCoreApplication a(argc, argv);
++    if (qgetenv("APP_ID").isEmpty()) {
++        qputenv("APP_ID", "copy-to-pasteboard");
++    }
++
++    QString text("Some text");
++
++    if (a.arguments().size() > 1)
++        text = a.arguments().at(1);
++
++    QMimeData data;
++    data.setText(text);
++
++    auto hub = cuc::Hub::Client::instance();
++
++    /* Won't work unless you disable the surface Id verification with CONTENT_HUB_TESTING=1 env var
++       To get the surface Id of a MirSurface in a real GUI app you should to it like the following:
++          MirPersistentId* mirPermaId = mir_surface_request_persistent_id_sync(mirSurface);
++          QString surfaceId = mir_persistent_id_as_string(mirPermaId);
++          mir_persistent_id_release(mirPermaId);
++    */
++    QString surfaceId("some-bogus-fake-surface-id");
++
++    hub->createPasteSync(surfaceId, const_cast<const QMimeData&>(data));
++
++    qDebug() << text;
++    qDebug() << hub->pasteFormats();
++}
 === added file 'examples/pasteboard/paste.cpp'
 --- examples/pasteboard/paste.cpp	1970-01-01 00:00:00 +0000
 +++ examples/pasteboard/paste.cpp	2016-08-25 13:22:47 +0000
@@ -0,0 +1,59 @@
++/*
++ * Copyright (C) 2016 Canonical, Ltd.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * 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: Ken VanDine <ken.vandine@canonical.com>
++ */
++
++#include <QCoreApplication>
++#include <QStringList>
++#include <com/ubuntu/content/hub.h>
++
++namespace cuc = com::ubuntu::content;
++
++int main(int argc, char *argv[])
++{
++    QCoreApplication a(argc, argv);
++    if (qgetenv("APP_ID").isEmpty()) {
++        qputenv("APP_ID", "paste-from-pasteboard");
++    }
++
++    QString id("latest");
++
++    if (a.arguments().size() > 1)
++        id = a.arguments().at(1);
++
++    auto hub = cuc::Hub::Client::instance();
++
++    /* Won't work unless you disable the surface Id verification with CONTENT_HUB_TESTING=1 env var
++       To get the surface Id of a MirSurface in a real GUI app you should to it like the following:
++          MirPersistentId* mirPermaId = mir_surface_request_persistent_id_sync(mirSurface);
++          QString surfaceId = mir_persistent_id_as_string(mirPermaId);
++          mir_persistent_id_release(mirPermaId);
++    */
++    QString surfaceId("some-bogus-fake-surface-id");
++
++    QMimeData *mimeData = nullptr;
++    if (id == "latest") {
++        mimeData = hub->latestPaste(surfaceId);
++    } else {
++        mimeData = hub->pasteById(surfaceId, id.toInt());
++    }
++    if (mimeData) {
++        qDebug() << id << ":" << mimeData->text();
++    } else {
++        qDebug() << "content-hub returned no mimedata.";
++    }
++    return 0;
++}
 === modified file 'import/Ubuntu/Content/CMakeLists.txt'
 --- import/Ubuntu/Content/CMakeLists.txt	2016-05-18 17:18:55 +0000
 +++ import/Ubuntu/Content/CMakeLists.txt	2016-08-25 13:22:47 +0000
@@ -39,6 +39,7 @@
      ${NIH_DBUS_INCLUDE_DIRS}
      ${DBUS_INCLUDE_DIRS}
      ${GLIB_INCLUDE_DIRS}
++    ${UBUNTU_LAUNCH_INCLUDE_DIRS}
+ )
  set(PLUGIN_HDRS
@@ -81,6 +82,7 @@
      ${NIH_LIBRARIES}
      ${NIH_DBUS_LIBRARIES}
      ${GLIB_LIBRARIES}
++    ${UBUNTU_LAUNCH_LDFLAGS}
+ )
  install(TARGETS ${PLUGIN} DESTINATION ${CONTENT_HUB_IMPORTS_DIR})
 === modified file 'include/com/ubuntu/content/hub.h'
 --- include/com/ubuntu/content/hub.h	2015-09-29 13:15:58 +0000
 +++ include/com/ubuntu/content/hub.h	2016-08-25 13:22:47 +0000
@@ -1,5 +1,5 @@
  /*
-- * Copyright © 2013 Canonical Ltd.
++ * Copyright © 2013,2016 Canonical Ltd.
+  *
   * This program is free software: you can redistribute it and/or modify
   * it under the terms of the GNU Lesser General Public License version 3 as
@@ -23,7 +23,10 @@
  #include <com/ubuntu/content/type.h>
  #include <QObject>
--#include <QVector>
++#include <QMimeData>
++
++class QStringList;
++class QDBusPendingCall;
  namespace com
+ {
@@ -38,6 +41,7 @@
  class Hub : public QObject
+ {
      Q_OBJECT
++    Q_PROPERTY(QStringList pasteFormats READ pasteFormats NOTIFY pasteFormatsChanged)
    public:
      struct Client
@@ -66,11 +70,34 @@
      Q_INVOKABLE virtual Transfer* create_share_to_peer_for_type(Peer peer, Type type);
      Q_INVOKABLE virtual bool has_pending(QString peer_id);
      Q_INVOKABLE virtual Peer peer_for_app_id(QString app_id);
--
++
++    ///
++    // Copy & Paste
++
++    QDBusPendingCall createPaste(const QString &surfaceId, const QMimeData& data);
++
++    QDBusPendingCall requestLatestPaste(const QString &surfaceId);
++    QDBusPendingCall requestPasteById(const QString &surfaceId, int pasteId);
++    QMimeData* paste(QDBusPendingCall requestPeply);
++
++    // synchronous versions
++    bool createPasteSync(const QString &surfaceId, const QMimeData& data);
++    QMimeData* latestPaste(const QString &surfaceId);
++    QMimeData* pasteById(const QString &surfaceId, int id);
++
++    QStringList pasteFormats();
++
++  Q_SIGNALS:
++    void pasteFormatsChanged();
++    void pasteboardChanged();
++
++  private Q_SLOTS:
++    void onPasteFormatsChanged(const QStringList &);
    protected:
      Hub(QObject* = nullptr);
--
++
    private:
++    void requestPasteFormats();
      struct Private;
      QScopedPointer<Private> d;
      bool eventFilter(QObject *obj, QEvent *event);
 === added file 'include/com/ubuntu/content/paste.h'
 --- include/com/ubuntu/content/paste.h	1970-01-01 00:00:00 +0000
 +++ include/com/ubuntu/content/paste.h	2016-08-25 13:22:47 +0000
@@ -0,0 +1,70 @@
++/*
++ * Copyright © 2016 Canonical Ltd.
++ *
++ * This program is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser 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 Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ *
++ * Authored by: Ken VanDine <ken.vandine@canonical.com>
++ */
++#ifndef COM_UBUNTU_CONTENT_PASTE_H_
++#define COM_UBUNTU_CONTENT_PASTE_H_
++
++#include <QObject>
++#include <QSharedPointer>
++#include <QMimeData>
++#include <QString>
++
++namespace com
++{
++namespace ubuntu
++{
++namespace content
++{
++
++class Paste : public QObject
++{
++    Q_OBJECT
++    Q_ENUMS(State)
++    Q_PROPERTY(int id READ id)
++    Q_PROPERTY(QString source READ source)
++
++  public:
++    enum State
++    {
++        created,
++        charged,
++        saved,
++        collected
++    };
++
++    Paste(const Paste&) = delete;
++    virtual ~Paste();
++
++    Paste& operator=(const Paste&) = delete;
++
++    Q_INVOKABLE virtual int id() const;
++    Q_INVOKABLE virtual QMimeData* mimeData();
++    Q_INVOKABLE virtual QString source() const;
++
++  private:
++    struct Private;
++    friend struct Private;
++    friend class Hub;
++    QSharedPointer<Private> d;
++
++    Paste(const QSharedPointer<Private>&, QObject* parent = nullptr);
++};
++}
++}
++}
++
++#endif // COM_UBUNTU_CONTENT_PASTE_H_
 === modified file 'src/com/ubuntu/content/CMakeLists.txt'
 --- src/com/ubuntu/content/CMakeLists.txt	2015-09-23 14:45:09 +0000
 +++ src/com/ubuntu/content/CMakeLists.txt	2016-08-25 13:22:47 +0000
@@ -47,6 +47,13 @@
    detail/transfer.h com::ubuntu::content::detail::Transfer)
  qt5_add_dbus_interface(
++  CONTENT_PASTE_STUB ${CMAKE_CURRENT_SOURCE_DIR}/detail/com.ubuntu.content.Paste.xml
++  ContentPasteInterface)
++qt5_add_dbus_adaptor(
++  CONTENT_PASTE_SKELETON ${CMAKE_CURRENT_SOURCE_DIR}/detail/com.ubuntu.content.Paste.xml
++  detail/paste.h com::ubuntu::content::detail::Paste)
++
++qt5_add_dbus_interface(
    CONTENT_HANDLER_STUB ${CMAKE_CURRENT_SOURCE_DIR}/detail/com.ubuntu.content.Handler.xml
    ContentHandlerInterface)
  qt5_add_dbus_adaptor(
@@ -56,6 +63,7 @@
  qt5_wrap_cpp(CONTENT_HUB_MOCS ${CMAKE_SOURCE_DIR}/include/com/ubuntu/content/hub.h)
  qt5_wrap_cpp(CONTENT_HUB_MOCS ${CMAKE_SOURCE_DIR}/include/com/ubuntu/content/import_export_handler.h)
  qt5_wrap_cpp(CONTENT_HUB_MOCS ${CMAKE_SOURCE_DIR}/include/com/ubuntu/content/item.h)
++qt5_wrap_cpp(CONTENT_HUB_MOCS ${CMAKE_SOURCE_DIR}/include/com/ubuntu/content/paste.h)
  qt5_wrap_cpp(CONTENT_HUB_MOCS ${CMAKE_SOURCE_DIR}/include/com/ubuntu/content/peer.h)
  qt5_wrap_cpp(CONTENT_HUB_MOCS ${CMAKE_SOURCE_DIR}/include/com/ubuntu/content/store.h)
  qt5_wrap_cpp(CONTENT_HUB_MOCS ${CMAKE_SOURCE_DIR}/include/com/ubuntu/content/transfer.h)
@@ -67,6 +75,7 @@
    hub.cpp
    import_export_handler.cpp
    item.cpp
++  paste.cpp
    peer.cpp
    store.cpp
    transfer.cpp
@@ -75,6 +84,7 @@
    debug.cpp
    detail/app_manager.cpp
++  detail/paste.cpp
    detail/service.cpp
    detail/transfer.cpp
    detail/handler.cpp
@@ -83,6 +93,8 @@
    ${CONTENT_HUB_MOCS}
    ${CONTENT_SERVICE_STUB}
    ${CONTENT_SERVICE_SKELETON}
++  ${CONTENT_PASTE_STUB}
++  ${CONTENT_PASTE_SKELETON}
    ${CONTENT_TRANSFER_STUB}
    ${CONTENT_TRANSFER_SKELETON}
    ${CONTENT_HANDLER_STUB}
 === added file 'src/com/ubuntu/content/detail/com.ubuntu.content.Paste.xml'
 --- src/com/ubuntu/content/detail/com.ubuntu.content.Paste.xml	1970-01-01 00:00:00 +0000
 +++ src/com/ubuntu/content/detail/com.ubuntu.content.Paste.xml	2016-08-25 13:22:47 +0000
@@ -0,0 +1,22 @@
++<node>
++  <interface name="com.ubuntu.content.dbus.Paste">
++    <signal name="StateChanged">
++      <arg name="state" type="i"/>
++    </signal>
++    <method name="Id">
++      <arg name="id" type="i" direction="out" />
++    </method>
++    <method name="State">
++      <arg name="state" type="i" direction="out" />
++    </method>
++    <method name="Charge">
++      <arg name="mimeData" type="ay" direction="in" />
++    </method>
++    <method name="MimeData">
++      <arg name="mimeData" type="ay" direction="out" />
++    </method>
++    <method name="source">
++      <arg name="source" type="s" direction="out" />
++    </method>
++ </interface>
++</node>
 === modified file 'src/com/ubuntu/content/detail/com.ubuntu.content.Service.xml'
 --- src/com/ubuntu/content/detail/com.ubuntu.content.Service.xml	2015-09-29 13:15:58 +0000
 +++ src/com/ubuntu/content/detail/com.ubuntu.content.Service.xml	2016-08-25 13:22:47 +0000
@@ -36,6 +36,22 @@
        <arg name="type_id" type="s" direction="in" />
        <arg name="transfer_object" type="o" direction="out" />
      </method>
++    <method name="CreatePaste">
++      <arg name="app_id" type="s" direction="in" />
++      <arg name="surfaceId" type="s" direction="in" />
++      <arg name="mimeData" type="ay" direction="in" />
++      <arg name="types" type="as" direction="in" />
++      <arg name="success" type="b" direction="out" />
++    </method>
++    <method name="GetLatestPasteData">
++      <arg name="surfaceId" type="s" direction="in" />
++      <arg name="mimeData" type="ay" direction="out" />
++    </method>
++    <method name="GetPasteData">
++      <arg name="surfaceId" type="s" direction="in" />
++      <arg name="pasteid" type="s" direction="in" />
++      <arg name="mimeData" type="ay" direction="out" />
++    </method>
      <method name="RegisterImportExportHandler">
        <arg name="peer_id" type="s" direction="in" />
        <arg name="handler_object" type="o" direction="in" />
@@ -51,5 +67,13 @@
        <arg name="app_id" type="s" direction="in" />
        <arg name="peer" type="v" direction="out" />
      </method>
++    <method name="PasteFormats">
++      <arg name="formats" type="as" direction="out" />
++    </method>
++    <signal name="PasteFormatsChanged">
++      <arg name="formats" type="as" />
++    </signal>
++    <signal name="PasteboardChanged">
++    </signal>
   </interface>
  </node>
 === added file 'src/com/ubuntu/content/detail/paste.cpp'
 --- src/com/ubuntu/content/detail/paste.cpp	1970-01-01 00:00:00 +0000
 +++ src/com/ubuntu/content/detail/paste.cpp	2016-08-25 13:22:47 +0000
@@ -0,0 +1,132 @@
++/*
++ * Copyright © 2016 Canonical Ltd.
++ *
++ * This program is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser 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 Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ *
++ * Authored by: Ken VanDine <ken.vandine@canonical.com>
++ */
++
++#include "debug.h"
++#include "paste.h"
++#include "utils.cpp"
++
++#include <QFileInfo>
++#include <com/ubuntu/content/hub.h>
++#include <com/ubuntu/content/store.h>
++#include <com/ubuntu/content/paste.h>
++#include <ubuntu/download_manager/download.h>
++#include <ubuntu/download_manager/manager.h>
++
++namespace cuc = com::ubuntu::content;
++namespace cucd = com::ubuntu::content::detail;
++
++struct cucd::Paste::Private
++{
++    Private(const int id,
++            const QString& source):
++        state(cuc::Paste::created),
++            id(id),
++            source(source)
++    {
++    }
++
++    cuc::Paste::State state;
++    const int id;
++    const QString source;
++    QString destination;
++    QByteArray mimeData;
++};
++
++cucd::Paste::Paste(const int id,
++                         const QString& source,
++                         QObject* parent) :
++    QObject(parent), d(new Private(id, source))
++{
++    TRACE() << __PRETTY_FUNCTION__;
++}
++
++cucd::Paste::~Paste()
++{
++    TRACE() << __PRETTY_FUNCTION__;
++}
++
++/* unique id of the paste */
++int cucd::Paste::Id()
++{
++    TRACE() << __PRETTY_FUNCTION__;
++    return d->id;
++}
++
++/* returns the add_id of the source app */
++QString cucd::Paste::source()
++{
++    TRACE() << __PRETTY_FUNCTION__;
++    return d->source;
++}
++
++/* returns the add_id of the destination app */
++QString cucd::Paste::destination()
++{
++    TRACE() << __PRETTY_FUNCTION__;
++    if (d->destination.isEmpty())
++        return d->source;
++    return d->destination;
++}
++
++void cucd::Paste::setDestination(QString& dest)
++{
++    TRACE() << __PRETTY_FUNCTION__;
++    d->destination = dest;
++}
++
++/* returns the object path for the paste */
++QString cucd::Paste::path()
++{
++    TRACE() << Q_FUNC_INFO << "destination:" << destination();
++    static const QString path_pattern{"/pastes/%1/%2"};
++    QString path = path_pattern
++            .arg(sanitize_id(destination()))
++            .arg(d->id);
++    return path;
++}
++
++int cucd::Paste::State()
++{
++    TRACE() << __PRETTY_FUNCTION__;
++    return d->state;
++}
++
++void cucd::Paste::Charge(const QByteArray& mimeData)
++{
++    TRACE() << __PRETTY_FUNCTION__ << "STATE:" << d->state;
++
++    if (d->state == cuc::Paste::charged)
++        return;
++
++    d->mimeData = mimeData;
++    d->state = cuc::Paste::charged;
++    Q_EMIT(StateChanged(d->state));
++}
++
++QByteArray cucd::Paste::MimeData()
++{
++    TRACE() << __PRETTY_FUNCTION__;
++
++    if (d->state != cuc::Paste::collected)
++    {
++        d->state = cuc::Paste::collected;
++        Q_EMIT(StateChanged(d->state));
++    }
++
++    return d->mimeData;
++}
 === added file 'src/com/ubuntu/content/detail/paste.h'
 --- src/com/ubuntu/content/detail/paste.h	1970-01-01 00:00:00 +0000
 +++ src/com/ubuntu/content/detail/paste.h	2016-08-25 13:22:47 +0000
@@ -0,0 +1,72 @@
++/*
++ * Copyright © 2016 Canonical Ltd.
++ *
++ * This program is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser 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 Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ *
++ * Authored by: Ken VanDine <ken.vandine@canonical.com>
++ */
++#ifndef PASTE_H_
++#define PASTE_H_
++
++#include <QByteArray>
++#include <QDir>
++#include <QObject>
++#include <QtDBus/QDBusMessage>
++#include <QtDBus/QDBusContext>
++
++namespace com
++{
++namespace ubuntu
++{
++namespace content
++{
++namespace detail
++{
++class Paste : public QObject, protected QDBusContext
++{
++    Q_OBJECT
++    Q_PROPERTY(int State READ State NOTIFY StateChanged)
++    Q_PROPERTY(int id READ Id)
++    Q_PROPERTY(QString source READ source)
++
++  public:
++    Paste(const int, const QString&, QObject* parent = nullptr);
++    Paste(const Paste&) = delete;
++    virtual ~Paste();
++
++    Paste& operator=(const Paste&) = delete;
++
++Q_SIGNALS:
++    void StateChanged(int State);
++
++  public Q_SLOTS:
++    int State();
++    void Charge(const QByteArray& mimeData);
++    QByteArray MimeData();
++    int Id();
++    QString source();
++    QString destination();
++    void setDestination(QString&);
++    QString path();
++
++  private:
++    struct Private;
++    QScopedPointer<Private> d;
++
++};
++}
++}
++}
++}
++
++#endif // PASTE_H_
 === modified file 'src/com/ubuntu/content/detail/service.cpp'
 --- src/com/ubuntu/content/detail/service.cpp	2016-01-29 17:20:58 +0000
 +++ src/com/ubuntu/content/detail/service.cpp	2016-08-25 13:22:47 +0000
@@ -23,6 +23,8 @@
  #include "service.h"
  #include "peer_registry.h"
  #include "i18n.h"
++#include "paste.h"
++#include "pasteadaptor.h"
  #include "transfer.h"
  #include "transferadaptor.h"
  #include "utils.cpp"
@@ -33,10 +35,12 @@
  #include <libnotify/notify.h>
  #include <com/ubuntu/content/item.h>
++#include <com/ubuntu/content/paste.h>
  #include <com/ubuntu/content/peer.h>
  #include <com/ubuntu/content/type.h>
  #include <com/ubuntu/content/transfer.h>
++#include <QDBusInterface>
  #include <QDBusMetaType>
  #include <QCache>
  #include <QCoreApplication>
@@ -74,14 +78,22 @@
                registry(registry),
                app_manager(application_manager)
+     {
++        unityFocus = new QDBusInterface("com.canonical.Unity.FocusInfo" /* service */,
++                                        "/com/canonical/Unity/FocusInfo" /* object path */,
++                                        "com.canonical.Unity.FocusInfo" /* interface */,
++                                        QDBusConnection::sessionBus(),
++                                        this);
+     }
      QDBusConnection connection;
      QSharedPointer<cucd::PeerRegistry> registry;
      QSet<cucd::Transfer*> active_transfers;
++    QList<cucd::Paste*> active_pastes;
++    QStringList pasteFormats;
      QSet<RegHandler*> handlers;
      QSharedPointer<cua::ApplicationManager> app_manager;
--
++    QDBusInterface *unityFocus;
++    const int maxActivePastes = 5;
  };
  cucd::Service::Service(QDBusConnection connection, const QSharedPointer<cucd::PeerRegistry>& peer_registry,
@@ -302,14 +314,96 @@
      return CreateTransfer(peer_id, src_id, cuc::Transfer::Share, type_id);
+ }
++bool cucd::Service::CreatePaste(const QString& app_id, const QString& surfaceId, const QByteArray& mimeData,
++                                const QStringList& types)
++{
++    TRACE() << Q_FUNC_INFO << app_id << types;
++
++    if (!verifiedSurfaceIsFocused(surfaceId)) {
++        return false;
++    }
++
++    static size_t import_counter{0}; import_counter++;
++
++    pid_t pid = d->connection.interface()->servicePid(this->message().service());
++    qWarning() << Q_FUNC_INFO << "PID: " << pid;
++    QString effective_app_id;
++    if (app_id_matches(app_id, pid)) {
++        effective_app_id = app_id;
++    } else {
++        qWarning() << "APP_ID" << app_id << "doesn't match requesting APP";
++        effective_app_id = "?";
++    }
++
++    auto paste = new cucd::Paste(import_counter, effective_app_id, this);
++    new PasteAdaptor(paste);
++    d->active_pastes.append(paste);
++
++    paste->Charge(mimeData);
++
++    if (d->active_pastes.count() > d->maxActivePastes) {
++        // get rid of the oldest one
++        delete d->active_pastes.takeFirst();
++    }
++
++    Q_EMIT(PasteboardChanged());
++
++    bool pendingPasteFormatsChangedSignal = false;
++    Q_FOREACH (QString t, types) {
++        TRACE() << Q_FUNC_INFO << "Type: " << t;
++        if (!d->pasteFormats.contains(t)) {
++            d->pasteFormats.append(t);
++            pendingPasteFormatsChangedSignal = true;
++        }
++    }
++    if (pendingPasteFormatsChangedSignal) {
++        Q_EMIT(PasteFormatsChanged(d->pasteFormats));
++    }
++
++    return true;
++}
++
++QByteArray cucd::Service::GetLatestPasteData(const QString& surfaceId)
++{
++    TRACE() << Q_FUNC_INFO;
++
++    if (d->active_pastes.isEmpty())
++        return QByteArray();
++
++    return getPasteData(surfaceId, d->active_pastes.last()->Id());
++}
++
++QByteArray cucd::Service::GetPasteData(const QString& surfaceId, const QString& pasteId)
++{
++    TRACE() << Q_FUNC_INFO << pasteId;
++
++    if (d->active_pastes.isEmpty())
++        return QByteArray();
++
++    return getPasteData(surfaceId, pasteId.toInt());
++}
++
++QByteArray cucd::Service::getPasteData(const QString &surfaceId, int pasteId)
++{
++    if (!verifiedSurfaceIsFocused(surfaceId)) {
++        qWarning().nospace() << "Surface isn't focused. Denying paste.";
++        return QByteArray();
++    }
++
++    Q_FOREACH (cucd::Paste *p, d->active_pastes)
++    {
++        if (p->Id() == pasteId)
++            return p->MimeData();
++    }
++    return QByteArray();
++}
++
  QDBusObjectPath cucd::Service::CreateTransfer(const QString& dest_id, const QString& src_id, int dir, const QString& type_id)
+ {
      TRACE() << Q_FUNC_INFO << "DEST:" << dest_id << "SRC:" << src_id << "DIRECTION:" << dir;
      static size_t import_counter{0}; import_counter++;
--    QUuid uuid{QUuid::createUuid()};
--
      Q_FOREACH (cucd::Transfer *t, d->active_transfers)
+     {
          if (t->destination() == dest_id || t->source() == src_id)
@@ -384,7 +478,7 @@
          TRACE() << Q_FUNC_INFO << "Charged";
          if (transfer->WasSourceStartedByContentHub())
              d->app_manager->stop_application(transfer->source().toStdString());
--
++
          gchar ** uris = NULL;
          if (d->registry->peer_is_legacy(transfer->destination())) {
              TRACE() << Q_FUNC_INFO << "Destination is a legacy app, collecting";
@@ -439,7 +533,7 @@
+                 }
+             }
              if (shouldStop)
--                d->app_manager->stop_application(transfer->source().toStdString());
++                d->app_manager->stop_application(transfer->source().toStdString());
+         }
          gchar ** uris = NULL;
          d->app_manager->invoke_application(transfer->destination().toStdString(), uris);
@@ -478,7 +572,7 @@
          if (d->registry->peer_is_legacy(transfer->destination())) {
              TRACE() << Q_FUNC_INFO << "Destination is a legacy app, collecting";
              transfer->SetStore(shared_dir_for_peer(transfer->destination()));
--
++
              auto items = transfer->Collect();
              gchar* urls[2] = {0};
              gint i = 0;
@@ -661,3 +755,18 @@
+     }
      return false;
+ }
++
++QStringList cucd::Service::PasteFormats()
++{
++    TRACE() << Q_FUNC_INFO;
++    return d->pasteFormats;
++}
++
++bool cucd::Service::verifiedSurfaceIsFocused(const QString &surfaceId)
++{
++    /* Only verify focus when not running under testing */
++    if (!qgetenv("CONTENT_HUB_TESTING").isNull())
++        return true;
++
++    return d->unityFocus->call("isSurfaceFocused", surfaceId).arguments().at(0).toBool();
++}
 === modified file 'src/com/ubuntu/content/detail/service.h'
 --- src/com/ubuntu/content/detail/service.h	2015-09-29 13:15:58 +0000
 +++ src/com/ubuntu/content/detail/service.h	2016-08-25 13:22:47 +0000
@@ -61,6 +61,10 @@
      QDBusObjectPath CreateImportFromPeer(const QString&, const QString&, const QString&);
      QDBusObjectPath CreateExportToPeer(const QString&, const QString&, const QString&);
      QDBusObjectPath CreateShareToPeer(const QString&, const QString&, const QString&);
++    bool CreatePaste(const QString&, const QString&, const QByteArray&, const QStringList&);
++    QByteArray GetLatestPasteData(const QString& surfaceId);
++    QByteArray GetPasteData(const QString& surfaceId, const QString& pasteId);
++    QStringList PasteFormats();
      void RegisterImportExportHandler(const QString&, const QDBusObjectPath& handler);
      void HandlerActive(const QString&);
@@ -70,12 +74,18 @@
      QDBusVariant PeerForId(const QString&);
    private:
++    QByteArray getPasteData(const QString &surfaceId, int pasteId);
      bool should_cancel(int);
++    bool verifiedSurfaceIsFocused(const QString &surfaceId);
      struct Private;
      struct RegHandler;
      QDBusServiceWatcher* m_watcher;
      QScopedPointer<Private> d;
++  Q_SIGNALS:
++    void PasteFormatsChanged(const QStringList &formats);
++    void PasteboardChanged();
++
    private Q_SLOTS:
      void handle_imports(int);
      void handle_exports(int);
 === modified file 'src/com/ubuntu/content/hub.cpp'
 --- src/com/ubuntu/content/hub.cpp	2016-07-15 18:54:41 +0000
 +++ src/com/ubuntu/content/hub.cpp	2016-08-25 13:22:47 +0000
@@ -21,6 +21,7 @@
  #include "ContentServiceInterface.h"
  #include "ContentHandlerInterface.h"
  #include "handleradaptor.h"
++#include "paste_p.h"
  #include "transfer_p.h"
  #include "utils.cpp"
@@ -32,6 +33,7 @@
  #include <com/ubuntu/content/type.h>
  #include <libertine.h>
++#include <QDBusPendingCallWatcher>
  #include <QIcon>
  #include <QStandardPaths>
  #include <QStringList>
@@ -52,6 +54,7 @@
+     }
      com::ubuntu::content::dbus::Service* service;
++    QStringList pasteFormats;
  };
  cuc::Hub::Hub(QObject* parent) : QObject(parent), d{new cuc::Hub::Private{this}}
@@ -79,6 +82,13 @@
          iconPaths << QString(path + "/usr/share/icons/");
+     }
      QIcon::setThemeSearchPaths(iconPaths);
++
++    QObject::connect(d->service, &com::ubuntu::content::dbus::Service::PasteFormatsChanged,
++            this, &cuc::Hub::Hub::onPasteFormatsChanged);
++    requestPasteFormats();
++    QObject::connect(d->service, SIGNAL(PasteboardChanged()),
++            this,
++            SIGNAL(pasteboardChanged()));
+ }
  cuc::Hub::~Hub()
@@ -91,6 +101,31 @@
      return hub;
+ }
++void cuc::Hub::requestPasteFormats()
++{
++    auto reply = d->service->PasteFormats();
++
++    auto replyWatcher = new QDBusPendingCallWatcher(reply, this);
++    connect(replyWatcher, &QDBusPendingCallWatcher::finished,
++            this, [this, replyWatcher]() {
++        QDBusPendingReply<QStringList> reply = *replyWatcher;
++        replyWatcher->deleteLater();
++        if (!reply.isError()) {
++            d->pasteFormats = reply.value();
++            Q_EMIT(pasteFormatsChanged());
++        }
++    });
++}
++
++void cuc::Hub::onPasteFormatsChanged(const QStringList &formats)
++{
++    TRACE() << Q_FUNC_INFO;
++
++    d->pasteFormats = formats;
++    TRACE() << Q_FUNC_INFO << d->pasteFormats;
++    Q_EMIT(pasteFormatsChanged());
++}
++
  bool cuc::Hub::eventFilter(QObject *obj, QEvent *event)
+ {
     if (event->type() == QEvent::ApplicationActivate)
@@ -100,7 +135,7 @@
+        {
             TRACE() << Q_FUNC_INFO << id << "Activated";
             d->service->HandlerActive(id);
--       } else
++       } else
+        {
             qWarning() << "APP_ID isn't set, the handler ignored";
+        }
@@ -181,7 +216,7 @@
      if (reply.isError())
          return result;
--
++
      auto peers = reply.value();
      QString id = app_id();
@@ -340,3 +375,64 @@
      auto peer = reply.value();
      return qdbus_cast<cuc::Peer>(peer.variant());
+ }
++
++QDBusPendingCall cuc::Hub::createPaste(const QString &surfaceId, const QMimeData& mimeData)
++{
++    /* This needs to be replaced with a better way to get the APP_ID */
++    QString appId = app_id();
++    TRACE() << Q_FUNC_INFO << appId;
++
++    auto serializedMimeData = serializeMimeData(mimeData);
++    if (serializedMimeData.isEmpty()) {
++        return QDBusPendingCall::fromCompletedCall(
++                QDBusMessage::createError("Data serialization failed","Could not serialize mimeData"));
++    }
++
++    return d->service->CreatePaste(appId, surfaceId, serializedMimeData, mimeData.formats());
++}
++
++bool cuc::Hub::createPasteSync(const QString &surfaceId, const QMimeData& data)
++{
++    QDBusPendingCall reply = createPaste(surfaceId, data);
++    reply.waitForFinished();
++    return !reply.isError();
++}
++
++QDBusPendingCall cuc::Hub::requestLatestPaste(const QString &surfaceId)
++{
++    TRACE() << Q_FUNC_INFO;
++    return d->service->GetLatestPasteData(surfaceId);
++}
++
++QDBusPendingCall cuc::Hub::requestPasteById(const QString &surfaceId, int pasteId)
++{
++    TRACE() << Q_FUNC_INFO;
++    return d->service->GetPasteData(surfaceId, QString::number(pasteId));
++}
++
++QMimeData* cuc::Hub::paste(QDBusPendingCall pendingCall)
++{
++    auto reply = QDBusPendingReply<QByteArray>(pendingCall);
++    reply.waitForFinished();
++
++    if (reply.isError())
++        return nullptr;
++
++    QByteArray serializedMimeData = qdbus_cast<QByteArray>(reply.value());
++    return deserializeMimeData(serializedMimeData);
++}
++
++QMimeData* cuc::Hub::latestPaste(const QString &surfaceId)
++{
++    return paste(requestLatestPaste(surfaceId));
++}
++
++QMimeData* cuc::Hub::pasteById(const QString &surfaceId, int pasteId)
++{
++    return paste(requestPasteById(surfaceId, pasteId));
++}
++
++QStringList cuc::Hub::pasteFormats() {
++    TRACE() << Q_FUNC_INFO;
++    return d->pasteFormats;
++}
 === added file 'src/com/ubuntu/content/paste.cpp'
 --- src/com/ubuntu/content/paste.cpp	1970-01-01 00:00:00 +0000
 +++ src/com/ubuntu/content/paste.cpp	2016-08-25 13:22:47 +0000
@@ -0,0 +1,50 @@
++/*
++ * Copyright © 2016 Canonical Ltd.
++ *
++ * This program is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser 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 Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ *
++ * Authored by: Ken VanDine <ken.vandine@canonical.com>
++ */
++
++#include <com/ubuntu/content/paste.h>
++
++#include "paste_p.h"
++#include "utils.cpp"
++
++namespace cuc = com::ubuntu::content;
++
++cuc::Paste::Paste(const QSharedPointer<cuc::Paste::Private>& d, QObject* parent)
++        : QObject(parent),
++          d(d)
++{
++}
++
++cuc::Paste::~Paste()
++{
++    TRACE() << Q_FUNC_INFO;
++}
++
++int cuc::Paste::id() const
++{
++    return d->id();
++}
++
++QMimeData* cuc::Paste::mimeData()
++{
++    return deserializeMimeData(d->mimeData());
++}
++
++QString cuc::Paste::source() const
++{
++    return d->source();
++}
 === added file 'src/com/ubuntu/content/paste_p.h'
 --- src/com/ubuntu/content/paste_p.h	1970-01-01 00:00:00 +0000
 +++ src/com/ubuntu/content/paste_p.h	2016-08-25 13:22:47 +0000
@@ -0,0 +1,100 @@
++/*
++ * Copyright © 2016 Canonical Ltd.
++ *
++ * This program is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser 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 Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ *
++ * Authored by: Ken VanDine <ken.vandine@canonical.com>
++ */
++#ifndef COM_UBUNTU_CONTENT_PASTE_P_H_
++#define COM_UBUNTU_CONTENT_PASTE_P_H_
++
++#include "common.h"
++#include "ContentPasteInterface.h"
++
++#include <com/ubuntu/content/item.h>
++#include <com/ubuntu/content/paste.h>
++
++#include <QByteArray>
++#include <QMimeData>
++#include <QObject>
++
++namespace com
++{
++namespace ubuntu
++{
++namespace content
++{
++class Paste::Private : public QObject
++{
++    Q_OBJECT
++  public:
++    static Paste* make_paste(const QDBusObjectPath& paste, QObject* parent)
++    {
++        QSharedPointer<Private> d{new Private{paste, parent}};
++        return new Paste{d, parent};
++    }
++
++    Private(const QDBusObjectPath& paste, QObject* parent)
++            : QObject(parent),
++              remote_paste(
++                  new com::ubuntu::content::dbus::Paste(
++                      HUB_SERVICE_NAME,
++                      paste.path(),
++                      QDBusConnection::sessionBus(), this))
++    {
++    }
++
++    int id()
++    {
++        auto reply = remote_paste->Id();
++        reply.waitForFinished();
++
++        return reply.value();
++    }
++
++    State state()
++    {
++        auto reply = remote_paste->State();
++        reply.waitForFinished();
++
++        return static_cast<Paste::State>(reply.value());
++    }
++
++    QByteArray mimeData()
++    {
++        auto reply = remote_paste->MimeData();
++        reply.waitForFinished();
++
++        if (reply.isError())
++            return nullptr;
++
++        QByteArray serializedMimeData = qdbus_cast<QByteArray>(reply.value());
++
++        return serializedMimeData;
++    }
++
++    QString source()
++    {
++        auto reply = remote_paste->source();
++        reply.waitForFinished();
++
++        return static_cast<QString>(reply.value());
++    }
++
++    com::ubuntu::content::dbus::Paste* remote_paste;
++};
++}
++}
++}
++
++#endif // COM_UBUNTU_CONTENT_PASTE_P_H_
 === modified file 'src/com/ubuntu/content/utils.cpp'
 --- src/com/ubuntu/content/utils.cpp	2015-10-23 15:12:48 +0000
 +++ src/com/ubuntu/content/utils.cpp	2016-08-25 13:22:47 +0000
@@ -1,5 +1,5 @@
  /*
-- * Copyright © 2013 Canonical Ltd.
++ * Copyright © 2013-2016 Canonical Ltd.
+  *
   * This program is free software: you can redistribute it and/or modify
   * it under the terms of the GNU Lesser General Public License version 3 as
@@ -20,6 +20,7 @@
  #include <QDir>
  #include <QFile>
  #include <QFileInfo>
++#include <QMimeData>
  #include <QProcess>
  #include <QtCore>
  #include <QtDBus/QDBusMessage>
@@ -33,6 +34,9 @@
  #include "com/ubuntu/content/type.h"
  #include <unistd.h>
  #include <liblibertine/libertine.h>
++#include <ubuntu-app-launch/appid.h>
++#include <ubuntu-app-launch/application.h>
++#include <ubuntu-app-launch/registry.h>
  #include <sys/apparmor.h>
  /* need to be exposed in libapparmor but for now ... */
@@ -40,9 +44,100 @@
  #define AA_MAY_READ (1 << 2)
  namespace cuc = com::ubuntu::content;
++namespace ual = ubuntu::app_launch;
  namespace {
++/* Used for pasteboard */
++const int maxFormatsCount = 16;
++const int maxBufferSize = 4 * 1024 * 1024;  // 4 Mb
++
++/*
++  Data format:
++   number of mime types      (sizeof(int))
++   data layout               ((4 * sizeof(int)) * number of mime types)
++     mime type string offset (sizeof(int))
++     mime type string size   (sizeof(int))
++     data offset             (sizeof(int))
++     data size               (sizeof(int))
++   data                      (n bytes)
++*/
++QByteArray serializeMimeData(const QMimeData &mimeData)
++{
++    const QStringList formats = mimeData.formats();
++    const int formatCount = qMin(formats.size(), maxFormatsCount);
++    const int headerSize = sizeof(int) + (formatCount * 4 * sizeof(int));
++    int bufferSize = headerSize;
++
++    for (int i = 0; i < formatCount; i++)
++        bufferSize += formats[i].size() + mimeData.data(formats[i]).size();
++
++    QByteArray serializedMimeData;
++    if (bufferSize <= maxBufferSize) {
++        // Serialize data.
++        serializedMimeData.resize(bufferSize);
++        {
++            char *buffer = serializedMimeData.data();
++            int* header = reinterpret_cast<int*>(serializedMimeData.data());
++            int offset = headerSize;
++            header[0] = formatCount;
++            for (int i = 0; i < formatCount; i++) {
++                const QByteArray data = mimeData.data(formats[i]);
++                const int formatOffset = offset;
++                const int formatSize = formats[i].size();
++                const int dataOffset = offset + formatSize;
++                const int dataSize = data.size();
++                memcpy(&buffer[formatOffset], formats[i].toLatin1().data(), formatSize);
++                memcpy(&buffer[dataOffset], data.data(), dataSize);
++                header[i*4+1] = formatOffset;
++                header[i*4+2] = formatSize;
++                header[i*4+3] = dataOffset;
++                header[i*4+4] = dataSize;
++                offset += formatSize + dataSize;
++            }
++        }
++    } else {
++        qWarning("Not sending contents (%d bytes) to the global clipboard as it's"
++                " bigger than the maximum allowed size of %d bytes", bufferSize, maxBufferSize);
++    }
++
++    return serializedMimeData;
++}
++
++QMimeData *deserializeMimeData(const QByteArray &serializedMimeData)
++{
++    if (static_cast<std::size_t>(serializedMimeData.size()) < sizeof(int)) {
++        // Data is invalid
++        return nullptr;
++    }
++
++    QMimeData *mimeData = new QMimeData;
++
++    const char* const buffer = serializedMimeData.constData();
++    const int* const header = reinterpret_cast<const int*>(serializedMimeData.constData());
++
++    const int count = qMin(header[0], maxFormatsCount);
++
++    for (int i = 0; i < count; i++) {
++        const int formatOffset = header[i*4+1];
++        const int formatSize = header[i*4+2];
++        const int dataOffset = header[i*4+3];
++        const int dataSize = header[i*4+4];
++
++        if (formatOffset + formatSize <= serializedMimeData.size()
++            && dataOffset + dataSize <= serializedMimeData.size()) {
++
++            QString mimeType = QString::fromLatin1(&buffer[formatOffset], formatSize);
++            QByteArray mimeDataBytes(&buffer[dataOffset], dataSize);
++
++            mimeData->setData(mimeType, mimeDataBytes);
++        }
++    }
++
++    return mimeData;
++}
++
++
  QList<cuc::Type> known_types()
+ {
      QList<cuc::Type> types;
@@ -104,6 +199,29 @@
+ }
++bool app_id_matches(QString id, pid_t pid)
++{
++    TRACE() << Q_FUNC_INFO << id << pid;
++
++    /* Don't verify app_id while testing */
++    if (!qgetenv("CONTENT_HUB_TESTING").isNull())
++        return true;
++
++    std::shared_ptr<ual::Registry> reg = ual::Registry::getDefault();
++    auto app_id = ual::AppID::find(id.toStdString());
++    if (app_id.empty())
++        return false;
++    auto app = ual::Application::create(app_id, reg);
++    if (!app.get()->hasInstances())
++        return false;
++    Q_FOREACH (std::shared_ptr<ual::Application::Instance> instance, app.get()->instances()) {
++        if (instance.get()->hasPid(pid))
++            return true;
++    }
++    return false;
++}
++
++
  QString aa_profile(QString uniqueConnectionId)
+ {
      TRACE() << Q_FUNC_INFO << uniqueConnectionId;
@@ -235,7 +353,7 @@
          qWarning() << "error:" << strerror(errno) << path;
          return false;
+     }
--
++
      if (allowed) {
          TRACE() << "ALLOWED:" << QString::number(allowed);
          return true;
 === modified file 'tests/acceptance-tests/CMakeLists.txt'
 --- tests/acceptance-tests/CMakeLists.txt	2015-06-29 13:46:54 +0000
 +++ tests/acceptance-tests/CMakeLists.txt	2016-08-25 13:22:47 +0000
@@ -41,6 +41,12 @@
+ )
  add_executable(
++  app_hub_communication_paste
++  app_hub_communication_paste.cpp
++  ${MOCS}
++)
++
++add_executable(
    app_hub_communication_handler
    app_hub_communication_handler.cpp
    ${MOCS}
@@ -68,32 +74,47 @@
    source_all.json
+ )
++add_executable(
++  mimedata_test
++  mimedata_test.cpp
++  ${MOCS}
++)
++
  qt5_use_modules(app_hub_communication_default_source Core Gui DBus Test)
  qt5_use_modules(app_hub_communication_known_sources Core Gui DBus Test)
  qt5_use_modules(app_hub_communication_stores Core Gui DBus Test)
  qt5_use_modules(app_hub_communication_transfer Core Gui DBus Test)
++qt5_use_modules(app_hub_communication_paste Core Gui DBus Test)
  qt5_use_modules(app_hub_communication_handler Core Gui DBus Test)
  qt5_use_modules(test_utils Core Test)
  qt5_use_modules(test_hook Core Gui DBus Test)
++qt5_use_modules(mimedata_test Core Test)
  target_link_libraries(app_hub_communication_stores content-hub gmock gtest gtest_main)
  target_link_libraries(app_hub_communication_default_source content-hub gmock gtest gtest_main)
  target_link_libraries(app_hub_communication_known_sources content-hub gmock gtest gtest_main)
  target_link_libraries(app_hub_communication_stores content-hub gmock gtest gtest_main)
  target_link_libraries(app_hub_communication_transfer content-hub gmock gtest gtest_main)
++target_link_libraries(app_hub_communication_paste content-hub gmock gtest gtest_main)
  target_link_libraries(app_hub_communication_handler content-hub gmock gtest gtest_main)
  target_link_libraries(test_utils content-hub gmock gtest gtest_main)
  target_link_libraries(test_types content-hub gmock gtest gtest_main)
  target_link_libraries(test_hook content-hub gmock gtest gtest_main ${GSETTINGS_LDFLAGS})
++target_link_libraries(mimedata_test content-hub gmock gtest gtest_main)
  add_test(app_hub_communication_default_source app_hub_communication_default_source)
  add_test(app_hub_communication_known_sources app_hub_communication_known_sources)
  add_test(app_hub_communication_stores app_hub_communication_stores)
  add_test(app_hub_communication_transfer app_hub_communication_transfer)
++add_test(app_hub_communication_paste app_hub_communication_transfer)
  add_test(app_hub_communication_handler app_hub_communication_handler)
  add_test(test_utils test_utils)
  add_test(test_types test_types)
  add_test(test_hook test_hook)
++add_test(mimedata_test mimedata_test)
++
++SET_TESTS_PROPERTIES(app_hub_communication_paste
++    PROPERTIES ENVIRONMENT "CONTENT_HUB_TESTING=1")
  set_target_properties(
    test_hook
 === added file 'tests/acceptance-tests/app_hub_communication_paste.cpp'
 --- tests/acceptance-tests/app_hub_communication_paste.cpp	1970-01-01 00:00:00 +0000
 +++ tests/acceptance-tests/app_hub_communication_paste.cpp	2016-08-25 13:22:47 +0000
@@ -0,0 +1,138 @@
++/*
++ * Copyright © 2016 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 Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ *
++ * Authored by: Ken VanDine <ken.vandine@canonical.com>
++ */
++
++#include "app_manager_mock.h"
++#include "test_harness.h"
++#include "../cross_process_sync.h"
++#include "../fork_and_run.h"
++
++#include <com/ubuntu/content/hub.h>
++#include <com/ubuntu/content/item.h>
++#include <com/ubuntu/content/paste.h>
++
++#include "com/ubuntu/content/detail/peer_registry.h"
++#include "com/ubuntu/content/detail/service.h"
++#include "com/ubuntu/content/serviceadaptor.h"
++
++#include <gmock/gmock.h>
++#include <gtest/gtest.h>
++
++#include <QCoreApplication>
++#include <QtDBus/QDBusConnection>
++#include <QStandardPaths>
++#include <QTemporaryDir>
++#include <QtTest/QTest>
++
++#include <thread>
++
++namespace cua = com::ubuntu::ApplicationManager;
++namespace cuc = com::ubuntu::content;
++namespace cucd = com::ubuntu::content::detail;
++
++void PrintTo(const QString& s, ::std::ostream* os) {
++    *os << std::string(qPrintable(s));
++}
++
++namespace
++{
++QString service_name{"com.ubuntu.content.dbus.Service"};
++
++struct MockedPeerRegistry : public cucd::PeerRegistry
++{
++    MockedPeerRegistry() : cucd::PeerRegistry()
++    {
++        using namespace ::testing;
++
++        ON_CALL(*this, default_source_for_type(_)).WillByDefault(Return(cuc::Peer::unknown()));
++        ON_CALL(*this, install_default_source_for_type(_,_)).WillByDefault(Return(false));
++        ON_CALL(*this, install_source_for_type(_,_)).WillByDefault(Return(false));
++    }
++
++    MOCK_METHOD1(default_source_for_type, cuc::Peer(cuc::Type t));
++    MOCK_METHOD1(enumerate_known_peers, void(const std::function<void(const cuc::Peer&)>&));
++    MOCK_METHOD2(enumerate_known_sources_for_type, void(cuc::Type, const std::function<void(const cuc::Peer&)>&));
++    MOCK_METHOD2(enumerate_known_destinations_for_type, void(cuc::Type, const std::function<void(const cuc::Peer&)>&));
++    MOCK_METHOD2(enumerate_known_shares_for_type, void(cuc::Type, const std::function<void(const cuc::Peer&)>&));
++    MOCK_METHOD2(install_default_source_for_type, bool(cuc::Type, cuc::Peer));
++    MOCK_METHOD2(install_source_for_type, bool(cuc::Type, cuc::Peer));
++    MOCK_METHOD2(install_destination_for_type, bool(cuc::Type, cuc::Peer));
++    MOCK_METHOD2(install_share_for_type, bool(cuc::Type, cuc::Peer));
++    MOCK_METHOD1(remove_peer, bool(cuc::Peer));
++    MOCK_METHOD1(peer_is_legacy, bool(QString));
++};
++}
++
++TEST(Hub, transfer_creation_and_states_work)
++{
++    using namespace ::testing;
++
++    test::CrossProcessSync sync;
++
++    auto parent = [&sync]()
++    {
++        int argc = 0;
++        QCoreApplication app{argc, nullptr};
++
++        QDBusConnection connection = QDBusConnection::sessionBus();
++
++        auto mock = new ::testing::NiceMock<MockedPeerRegistry>{};
++
++        QSharedPointer<cucd::PeerRegistry> registry{mock};
++        auto app_manager = QSharedPointer<cua::ApplicationManager>(new MockedAppManager());
++        cucd::Service implementation(connection, registry, app_manager, &app);
++        new ServiceAdaptor(std::addressof(implementation));
++
++        ASSERT_TRUE(connection.registerService(service_name));
++        ASSERT_TRUE(connection.registerObject("/", std::addressof(implementation)));
++
++        sync.signal_ready();
++
++        app.exec();
++
++        connection.unregisterObject("/");
++        connection.unregisterService(service_name);
++    };
++
++    auto child = [&sync]()
++    {
++        int argc = 0;
++        QCoreApplication app(argc, nullptr);
++
++        sync.wait_for_signal_ready();
++
++        test::TestHarness harness;
++        harness.add_test_case([]()
++        {
++            qputenv("APP_ID", "some-app");
++
++            QMimeData data;
++            data.setText("some text");
++            auto hub = cuc::Hub::Client::instance();
++            QString surfaceId("some-bogus-fake-surface-id");
++            bool ok = hub->createPasteSync(surfaceId, const_cast<const QMimeData&>(data));
++            ASSERT_TRUE(ok);
++            EXPECT_EQ(QString(data.text()), QString(hub->latestPaste(surfaceId)->text()));
++            EXPECT_EQ(QString(data.text()), QString(hub->pasteById(surfaceId, 1)->text()));
++
++            hub->quit();
++        });
++        EXPECT_EQ(0, QTest::qExec(std::addressof(harness)));
++    };
++
++    EXPECT_EQ(EXIT_SUCCESS, test::fork_and_run(child, parent));
++}
 === added file 'tests/acceptance-tests/mimedata_test.cpp'
 --- tests/acceptance-tests/mimedata_test.cpp	1970-01-01 00:00:00 +0000
 +++ tests/acceptance-tests/mimedata_test.cpp	2016-08-25 13:22:47 +0000
@@ -0,0 +1,44 @@
++/*
++ * Copyright (C) 2014-2016 Canonical, Ltd.
++ *
++ * This program is free software: you can redistribute it and/or modify it under
++ * the terms of the GNU Lesser 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 warranties of MERCHANTABILITY,
++ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++#include <gtest/gtest.h>
++
++#include "../../src/com/ubuntu/content/utils.cpp"
++
++#include <QMimeData>
++
++TEST(PasteBoardTest, MimeDataSerialization)
++{
++    QMimeData mimeData;
++    mimeData.setData("text/plain", "Hello World!");
++    mimeData.setData("text/html", "<html lang=\"en\"><body>Hello World!</body></html>");
++
++    QByteArray serializedMimeData = serializeMimeData(const_cast<const QMimeData&>(mimeData));
++
++    ASSERT_TRUE(serializedMimeData.size() > 0);
++
++    QMimeData *deserializedMimeData = deserializeMimeData(serializedMimeData);
++
++    ASSERT_TRUE(deserializedMimeData != nullptr);
++
++    ASSERT_TRUE(deserializedMimeData->hasFormat("text/plain"));
++    ASSERT_EQ(mimeData.data("text/plain"), deserializedMimeData->data("text/plain"));
++
++    ASSERT_TRUE(deserializedMimeData->hasFormat("text/html"));
++    ASSERT_EQ(mimeData.data("text/html"), deserializedMimeData->data("text/html"));
++
++    delete deserializedMimeData;
++}