Differential D18845 Diff 51753 core/polkitqt1-authority.cpp

Changeset View

Standalone View

core/polkitqt1-authority.cpp

Context not available.
123	*m_revokeTemporaryAuthorizationsCancellable,	123		*m_revokeTemporaryAuthorizationsCancellable,
124	*m_revokeTemporaryAuthorizationCancellable;	124		*m_revokeTemporaryAuthorizationCancellable;
125		125
126		126		/**
		127		* \brief Convert a Qt DetailsMap to the lower level PolkitDetails type
		128		*
		129		* The returned pointer needs to be freed via g_object_unref when no
		130		* longer needed. Returns nullptr if details is empty.
			brunsUnsubmitted Not Done nullptr bruns: nullptr
		131		*/
		132		static PolkitDetails* convertDetailsMap(const DetailsMap &details);
127	static void pk_config_changed();	133		static void pk_config_changed();
128	static void checkAuthorizationCallback(GObject object, GAsyncResult result, gpointer user_data);	134		static void checkAuthorizationCallback(GObject object, GAsyncResult result, gpointer user_data);
129	static void enumerateActionsCallback(GObject object, GAsyncResult result, gpointer user_data);	135		static void enumerateActionsCallback(GObject object, GAsyncResult result, gpointer user_data);
Context not available.
316	d->m_lastError = E_None;	322		d->m_lastError = E_None;
317	}	323		}
318		324
		325		PolkitDetails* Authority::Private::convertDetailsMap(const DetailsMap &details)
		326		{
		327		if (details.empty())
		328		return nullptr;
			brunsUnsubmitted Not Done nullptr bruns: nullptr
			mgerstnerAuthorUnsubmitted Not Done I didn't want to mix styles in the source files. It's adjusted now. mgerstner: I didn't want to mix styles in the source files. It's adjusted now.
		329
		330		auto ret = polkit_details_new();
		331
		332		for (const auto &entry: details.toStdMap()) {
			brunsUnsubmitted Not Done whitespace bruns: whitespace
		333		const auto &key = entry.first;
		334		const auto &value = entry.second;
		335
		336		polkit_details_insert(ret, key.toUtf8().data(), value.toUtf8().data());
			chinmoyrUnsubmitted Not Done Nitpick; constData() because the API seems to take const gchar* chinmoyr: Nitpick; constData() because the API seems to take const gchar*
			mgerstnerAuthorUnsubmitted Not Done Strictly spoken it already returns `const gchar`, since `toUtf8()` returns a `const QByteArray` temporary object and thus the `const char data() const` member function should be called here. Anways I will make it explicit like you suggest. mgerstner: Strictly spoken it already returns `const gchar*`, since `toUtf8()` returns a `const…
		337		}
		338
		339		return ret;
		340		}
		341
319	void Authority::Private::pk_config_changed()	342		void Authority::Private::pk_config_changed()
320	{	343		{
321	Q_EMIT Authority::instance()->configChanged();	344		Q_EMIT Authority::instance()->configChanged();
Context not available.
326	return d->pkAuthority;	349		return d->pkAuthority;
327	}	350		}
328		351
329	Authority::Result Authority::checkAuthorizationSync(const QString &actionId, const Subject &subject, AuthorizationFlags flags)	352		Authority::Result Authority::checkAuthorizationSyncWithDetails(const QString &actionId, const Subject &subject, AuthorizationFlags flags, const DetailsMap &details)
330	{	353		{
331	PolkitAuthorizationResult *pk_result;	354		PolkitAuthorizationResult *pk_result;
332	GError *error = NULL;	355		GError *error = NULL;
Context not available.
340	return Unknown;	363		return Unknown;
341	}	364		}
342		365
		366		auto pk_details = Authority::Private::convertDetailsMap(details);
		367
343	pk_result = polkit_authority_check_authorization_sync(d->pkAuthority,	368		pk_result = polkit_authority_check_authorization_sync(d->pkAuthority,
344	subject.subject(),	369		subject.subject(),
345	actionId.toLatin1().data(),	370		actionId.toLatin1().data(),
346	NULL,	371		pk_details,
347	(PolkitCheckAuthorizationFlags)(int)flags,	372		(PolkitCheckAuthorizationFlags)(int)flags,
348	NULL,	373		NULL,
349	&error);	374		&error);
350		375
		376		if (pk_details) {
		377		g_object_unref(pk_details);
		378		}
		379
351	if (error != NULL) {	380		if (error != NULL) {
352	d->setError(E_CheckFailed, error->message);	381		d->setError(E_CheckFailed, error->message);
353	g_error_free(error);	382		g_error_free(error);
Context not available.
364	}	393		}
365	}	394		}
366		395
367	void Authority::checkAuthorization(const QString &actionId, const Subject &subject, AuthorizationFlags flags)	396		Authority::Result Authority::checkAuthorizationSync(const QString &actionId, const Subject &subject, AuthorizationFlags flags)
		397		{
		398		return checkAuthorizationSyncWithDetails(actionId, subject, flags, DetailsMap());
		399		}
		400
		401		void Authority::checkAuthorizationWithDetails(const QString &actionId, const Subject &subject, AuthorizationFlags flags, const DetailsMap &details)
368	{	402		{
369	if (Authority::instance()->hasError()) {	403		if (Authority::instance()->hasError()) {
370	return;	404		return;
Context not available.
375	return;	409		return;
376	}	410		}
377		411
		412		auto pk_details = Authority::Private::convertDetailsMap(details);
		413
378	polkit_authority_check_authorization(d->pkAuthority,	414		polkit_authority_check_authorization(d->pkAuthority,
379	subject.subject(),	415		subject.subject(),
380	actionId.toLatin1().data(),	416		actionId.toLatin1().data(),
381	NULL,	417		pk_details,
382	(PolkitCheckAuthorizationFlags)(int)flags,	418		(PolkitCheckAuthorizationFlags)(int)flags,
383	d->m_checkAuthorizationCancellable,	419		d->m_checkAuthorizationCancellable,
384	d->checkAuthorizationCallback, this);	420		d->checkAuthorizationCallback, this);
		421
		422		if (pk_details) {
			brunsUnsubmitted Not Done nullptr, or just `if (pk_details) {` bruns: nullptr, or just `if (pk_details) {`
		423		g_object_unref(pk_details);
		424		}
		425		}
		426
		427		void Authority::checkAuthorization(const QString &actionId, const Subject &subject, AuthorizationFlags flags)
		428		{
		429		checkAuthorizationWithDetails(actionId, subject, flags, DetailsMap());
385	}	430		}
386		431
387	void Authority::Private::checkAuthorizationCallback(GObject object, GAsyncResult result, gpointer user_data)	432		void Authority::Private::checkAuthorizationCallback(GObject object, GAsyncResult result, gpointer user_data)
Context not available.