Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'jb47597' into 'master'
[sailfish-access-control] Add QML plugin. Contributes to JB#47597

See merge request mer-core/sailfish-access-control!2
  • Loading branch information
Tomin1 committed Dec 12, 2019
2 parents 237bcbf + 79007d4 commit f73064b
Show file tree
Hide file tree
Showing 14 changed files with 235 additions and 7 deletions.
9 changes: 9 additions & 0 deletions .gitignore
@@ -0,0 +1,9 @@
/RPMS/
*.list
*.moc
*.o
*.pc
*.so
*.so.*
moc_*
qt/Makefile
File renamed without changes.
9 changes: 9 additions & 0 deletions glib/glib.pro
@@ -0,0 +1,9 @@
# For QtCreator integration purposes. Not meant for building the project.
TEMPLATE = aux

HEADERS += sailfishaccesscontrol.h
SOURCES += sailfishaccesscontrol.c

OTHER_FILES += \
Makefile \
sailfishaccesscontrol.pc.tpl \
File renamed without changes.
File renamed without changes.
File renamed without changes.
46 changes: 46 additions & 0 deletions qt/accesscontrol.cpp
@@ -0,0 +1,46 @@
/*
* Copyright (c) 2019 Open Mobile Platform LLC.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library 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 library; if not, see <http://www.gnu.org/licenses/>.
*/

#include "accesscontrol.h"
#include "sailfishaccesscontrol.h"

using namespace Sailfish;

AccessControl::AccessControl(QObject *parent)
: QObject(parent)
{
}

AccessControl::~AccessControl()
{
}

bool AccessControl::hasGroup(int uid, const QString groupName)
{
switch (uid) {
case RealUid:
uid = getuid();
break;
case EffectiveUid:
uid = geteuid();
break;
default:
Q_ASSERT_X(uid >= 0, Q_FUNC_INFO, "Uid must be either of enum type Uid or non-negative.");
break;
}
return sailfish_access_control_hasgroup(uid, groupName.toLatin1().data());
}
44 changes: 44 additions & 0 deletions qt/accesscontrol.h
@@ -0,0 +1,44 @@
/*
* Copyright (c) 2019 Open Mobile Platform LLC.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library 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 library; if not, see <http://www.gnu.org/licenses/>.
*/

#ifndef SAILFISH_ACCESSCONTROL_H
#define SAILFISH_ACCESSCONTROL_H

#include <QObject>

namespace Sailfish {

class AccessControl : public QObject
{
Q_OBJECT

public:
explicit AccessControl(QObject *parent = 0);
~AccessControl();

enum Uid : int {
RealUid = -1,
EffectiveUid = -2
};
Q_ENUM(Uid)

Q_INVOKABLE bool hasGroup(int uid, const QString groupName);
};

}

#endif // SAILFISH_ACCESSCONTROL_H
45 changes: 45 additions & 0 deletions qt/plugin.cpp
@@ -0,0 +1,45 @@
/*
* Copyright (c) 2019 Open Mobile Platform LLC.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library 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 library; if not, see <http://www.gnu.org/licenses/>.
*/

#include <QQmlExtensionPlugin>
#include <QQmlEngine>
#include <qqml.h>

#include "accesscontrol.h"

using namespace Sailfish;

template <typename T> static QObject *singletonApiCallback(QQmlEngine *engine, QJSEngine *)
{
return new T(engine);
}

class SailfishAccessControlPlugin : public QQmlExtensionPlugin
{
Q_OBJECT
Q_PLUGIN_METADATA(IID "Sailfish.AccessControl" )

public:
virtual void registerTypes(const char *uri)
{
if (QLatin1String(uri) == QLatin1String("Sailfish.AccessControl")) {
qmlRegisterSingletonType<AccessControl>(uri, 1, 0, "AccessControl", singletonApiCallback<AccessControl>);
}
}
};

#include "plugin.moc"
2 changes: 2 additions & 0 deletions qt/qmldir
@@ -0,0 +1,2 @@
module Sailfish.AccessControl
plugin sailfishaccesscontrolplugin
29 changes: 29 additions & 0 deletions qt/qt.pro
@@ -0,0 +1,29 @@
MODULENAME = Sailfish/AccessControl
DEFINES *= MODULENAME=\"\\\"\"$${MODULENAME}\"\\\"\"
TEMPLATE = lib
TARGET = sailfishaccesscontrolplugin
TARGET = $$qtLibraryTarget($$TARGET)
TARGETPATH = $$[QT_INSTALL_QML]/$$MODULENAME

QT -= gui
QT += qml
CONFIG += \
plugin \
link_pkgconfig \
hide_symbols \
c++14

PKGCONFIG += sailfishaccesscontrol

HEADERS += accesscontrol.h

SOURCES += plugin.cpp \
accesscontrol.cpp

import.files = *.qml *.js qmldir plugins.qmltypes
import.path = $$TARGETPATH
target.path = $$TARGETPATH
INSTALLS += target import

QMAKE_CXXFLAGS += -Wall
OTHER_FILES += qmldir *.qml *.js
47 changes: 47 additions & 0 deletions rpm/sailfish-access-control-qt5.spec
@@ -0,0 +1,47 @@
Name: sailfish-access-control-qt5
Summary: Sailfish Access Control QML plugin
Version: 0.0.1
Release: 1
License: LGPLv2+
URL: https://git.sailfishos.org/mer-core/sailfish-access-control
Source0: %{name}-%{version}.tar.bz2
BuildRequires: pkgconfig(sailfishaccesscontrol) = %{version}
BuildRequires: pkgconfig(Qt5Core)
BuildRequires: pkgconfig(Qt5Qml)

%description
%{summary}.

This library should be used to check whether a user
belongs to a group or not.

%package -n sailfish-access-control-qml-plugin
Summary: Sailfish Access Control QML plugin
Requires: sailfish-access-control = %{version}
Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig

%description -n sailfish-access-control-qml-plugin
%{summary}.

This library should be used to check whether a user
belongs to a group or not.

%prep
%setup -q -n %{name}-%{version}/qt

%build
%qmake5

%install
rm -rf %{buildroot}

%qmake5_install

%post -n sailfish-access-control-qml-plugin -p /sbin/ldconfig

%postun -n sailfish-access-control-qml-plugin -p /sbin/ldconfig

%files -n sailfish-access-control-qml-plugin
%defattr(-,root,root,-)
%{_libdir}/qt5/qml/Sailfish/AccessControl
2 changes: 1 addition & 1 deletion rpm/sailfish-access-control.spec
Expand Up @@ -26,7 +26,7 @@ Requires: %{name} = %{version}-%{release}
C language headers of the Sailfish Access Control library.

%prep
%setup -q -n %{name}-%{version}
%setup -q -n %{name}-%{version}/glib

%build
make ROOT=%{buildroot} %{_smp_mflags} VERSION=%{version}
Expand Down
9 changes: 3 additions & 6 deletions sailfish-access-control.pro
@@ -1,10 +1,7 @@
# For QtCreator integration purposes. Not meant for building the project.
TEMPLATE = aux

HEADERS += sailfishaccesscontrol.h
SOURCES += sailfishaccesscontrol.c
TEMPLATE = subdir
SUBDIRS = glib qt

OTHER_FILES += \
Makefile \
sailfishaccesscontrol.pc.tpl \
rpm/sailfish-access-control.spec \
rpm/sailfish-access-control-qt5.spec \

0 comments on commit f73064b

Please sign in to comment.