lib_LTLIBRARIES = libmoonshot/libmoonshot.la
-bin_PROGRAMS = src/moonshot
-
+bin_PROGRAMS = \
+ src/moonshot \
+ src/moonshot-webp
AM_CFLAGS =
-I$(top_srcdir)/libmoonshot
AM_VALAFLAGS = \
- config.vapi \
- --pkg gtk+-2.0
+ config.vapi \
+ --pkg gio-2.0
libmoonshot_libmoonshot_la_CPPFLAGS = \
src/moonshot-password-dialog.vala \
src/moonshot-utils.vala
-src_moonshot_LDADD = \
- $(moonshot_LIBS)
-
-src_moonshot_CPPFLAGS = \
- $(moonshot_CFLAGS) \
- $(AM_CPPFLAGS)
+src_moonshot_webp_SOURCES = \
+ src/moonshot-webp-parser.vala \
+ src/moonshot-id.vala
+src_moonshot_VALAFLAGS = --pkg gtk+-2.0 $(AM_VALAFLAGS)
+src_moonshot_CPPFLAGS = $(moonshot_CFLAGS) $(AM_CPPFLAGS)
+src_moonshot_LDADD = $(moonshot_LIBS)
+src_moonshot_webp_VALAFLAGS = --vapidir=$(top_srcdir)/libmoonshot --pkg libmoonshot $(AM_VALAFLAGS)
+src_moonshot_webp_CPPFLAGS = $(moonshot_CFLAGS) $(AM_CPPFLAGS)
+src_moonshot_webp_LDADD = $(moonshot_LIBS) ${top_builddir}/libmoonshot/libmoonshot.la
if OS_WIN32
libmoonshot_libmoonshot_la_LDFLAGS = -no-undefined
src_moonshot_CFLAGS = -mwindows
-#src_moonshot_webp_CFLAGS = -mwindows
+src_moonshot_webp_CFLAGS = -mwindows
AM_CPPFLAGS += -DOS_WIN32
AM_VALAFLAGS += --define=OS_WIN32
if OS_LINUX
-bin_PROGRAMS += src/moonshot-webp
-
-src_moonshot_webp_SOURCES = src/moonshot-webp-parser.vala src/moonshot-id.vala
-src_moonshot_webp_CPPFLAGS = $(moonshot_CFLAGS) $(AM_CPPFLAGS)
-src_moonshot_webp_LDADD = $(moonshot_LIBS)
-
## Installing mime type data
mimedir = $(datadir)/mime/packages
mime_DATA = webprovisioning/moonshot.xml
dbus_proxy = get_dbus_proxy (error);
if (*error != NULL)
- return;
+ return FALSE;
- g_return_if_fail (DBUS_IS_G_PROXY (dbus_proxy));
+ g_return_val_if_fail (DBUS_IS_G_PROXY (dbus_proxy), FALSE);
dbus_g_proxy_call (dbus_proxy,
"GetIdentity",
if (*error != NULL)
return FALSE;
- g_return_if_fail (DBUS_IS_G_PROXY (dbus_proxy));
+ g_return_val_if_fail (DBUS_IS_G_PROXY (dbus_proxy), FALSE);
dbus_g_proxy_call (dbus_proxy,
"GetDefaultIdentity",
return TRUE;
}
+
+int moonshot_install_id_card (const char *display_name,
+ const char *user_name,
+ const char *password,
+ const char *realm,
+ char *rules_patterns[],
+ int rules_patterns_length,
+ char *rules_always_confirm[],
+ int rules_always_confirm_length,
+ char *services[],
+ int services_length,
+ const char *ca_cert,
+ const char *subject,
+ const char *subject_alt,
+ const char *server_cert,
+ MoonshotError **error)
+{
+ GError *g_error = NULL;
+ DBusGProxy *dbus_proxy;
+ int success = FALSE;
+ int i;
+ const char **rules_patterns_strv,
+ **rules_always_confirm_strv,
+ **services_strv;
+
+ dbus_proxy = get_dbus_proxy (error);
+
+ if (*error != NULL)
+ return FALSE;
+
+ g_return_val_if_fail (DBUS_IS_G_PROXY (dbus_proxy), FALSE);
+ g_return_val_if_fail (rules_patterns_length == rules_always_confirm_length), FALSE);
+
+ /* Marshall array and struct parameters for DBus */
+ rules_patterns_strv = g_malloc ((rules_length + 1) * sizeof (const char *));
+ rules_always_confirm_strv = g_malloc ((rules_length + 1) * sizeof (const char *));
+ services_strv = g_malloc ((services_length + 1) * sizeof (const char *));
+
+ for (i = 0; i < rules_patterns_length; i ++) {
+ rules_pattern_strv[i] = rules_patterns[i];
+ rules_always_confirm_strv[i] = rules_always_confirm[i];
+ }
+
+ for (i = 0; i < services_length; i ++)
+ services_strv[i] = services[i];
+
+ rules_pattern_strv[rules_patterns_length] = NULL;
+ rules_always_confirm_strv[rules_patterns_length] = NULL;
+ services_strv[services_length] = NULL;
+
+ dbus_g_proxy_call (dbus_proxy,
+ "InstallIdCard",
+ &g_error,
+ G_TYPE_STRING, display_name,
+ G_TYPE_STRING, user_name,
+ G_TYPE_STRING, password,
+ G_TYPE_STRING, realm,
+ G_TYPE_STRV, rules_pattern_strv,
+ G_TYPE_STRV, rules_always_confirm_strv,
+ G_TYPE_STRV, services_strv,
+ G_TYPE_STRING, ca_cert,
+ G_TYPE_STRING, subject,
+ G_TYPE_STRING, subject_alt,
+ G_TYPE_STRING, server_cert,
+ G_TYPE_INVALID,
+ G_TYPE_BOOLEAN, &success,
+ G_TYPE_INVALID);
+
+ g_object_unref (dbus_proxy);
+
+ if (g_error != NULL) {
+ *error = moonshot_error_new (MOONSHOT_ERROR_IPC_ERROR,
+ g_error->message);
+ return FALSE;
+ }
+
+ return success;
+}
rpc_async_call_init (&call);
+ if (nai == NULL) nai = "";
+ if (password == NULL) password = "";
+ if (service == NULL) service = "";
+
*nai_out = NULL;
*password_out = NULL;
*server_certificate_hash_out = NULL;
return TRUE;
};
+int moonshot_install_id_card (const char *display_name,
+ const char *user_name,
+ const char *password,
+ const char *realm,
+ char *rules_patterns[],
+ int rules_patterns_length,
+ char *rules_always_confirm[],
+ int rules_always_confirm_length,
+ char *services[],
+ int services_length,
+ const char *ca_cert,
+ const char *subject,
+ const char *subject_alt,
+ const char *server_cert,
+ MoonshotError **error)
+{
+ int success = FALSE;
+
+ init_rpc (error);
+
+ if (user_name == NULL) user_name = "";
+ if (password == NULL) password = "";
+ if (realm == NULL) realm = "";
+ if (ca_cert == NULL) ca_cert = "";
+ if (subject == NULL) subject = "";
+ if (subject_alt == NULL) subject_alt = "";
+ if (server_cert == NULL) server_cert = "";
+
+ RPC_TRY_EXCEPT {
+ success = moonshot_install_id_card_rpc (display_name,
+ user_name,
+ password,
+ realm,
+ rules_patterns,
+ rules_patterns_length,
+ rules_always_confirm,
+ rules_always_confirm_length,
+ services,
+ services_length,
+ ca_cert,
+ subject,
+ subject_alt,
+ server_cert);
+ }
+ RPC_EXCEPT {
+ *error = moonshot_error_new_from_status (MOONSHOT_ERROR_IPC_ERROR,
+ RPC_GET_EXCEPTION_CODE ());
+ }
+ RPC_END_EXCEPT
+
+ return success;
+}
+
BOOL WINAPI DllMain (HINSTANCE hinst,
DWORD reason,
void *reserved)
*
* Return value: %TRUE if an identity was available, otherwise %FALSE.
*/
-int moonshot_default_get_identity (char **nai_out,
+int moonshot_get_default_identity (char **nai_out,
char **password_out,
char **server_certificate_hash_out,
char **ca_certificate_out,
char **subject_alt_name_constraint_out,
MoonshotError **error);
+
+/**
+ * moonshot_install_id_card:
+ * @display_name: Display name of card
+ * @user_name: Username for identity, or %NULL
+ * @password: Password for identity, or %NULL
+ * @realm: Realm for identity, or %NULL
+ * @rules_patterns: Array of patterns for the service matching rules
+ * @rules_patterns_length: Length of @rules_patterns and @rules_always_confirm arrays
+ * @rules_always_confirm: Array of 'always confirm' flags corresponding to patterns
+ * @rules_always_confirm_length: Length of @rules_patterns and @rules_always_confirm arrays
+ * @services: Array of strings listing the services this identity provides
+ * @services_length: Length of @services array
+ * @ca_cert: The CA certificate, or %NULL
+ * @subject: Subject name constraint for @ca_cert, or %NULL
+ * @subject_alt: Subject alternative name constraint for @ca_cert, or %NULL
+ * @server_cert: Hash of the server certificate; required if @ca_cert is %NULL
+ * @error: Return location for a #MoonshotError.
+ *
+ * Calls the Moonshot server to add a new identity. The user will be prompted
+ * if they would like to add the ID card.
+ *
+ * The values for @rules_patterns_length and @rules_always_confirm_length should
+ * always be the same. They are present as separate parameters as a concession to
+ * the Vala bindings.
+ *
+ * Return value: %TRUE if the ID card was successfully added, %FALSE otherwise
+ */
+int moonshot_install_id_card (const char *display_name,
+ const char *user_name,
+ const char *password,
+ const char *realm,
+ char *rules_patterns[],
+ int rules_patterns_length,
+ char *rules_always_confirm[],
+ int rules_always_confirm_length,
+ char *services[],
+ int services_length,
+ const char *ca_cert,
+ const char *subject,
+ const char *subject_alt,
+ const char *server_cert,
+ MoonshotError **error);
+
#endif
--- /dev/null
+/* Vala binding between libmoonshot helper library */
+
+[CCode (cheader_filename = "libmoonshot.h")]
+namespace Moonshot {
+ [Compact]
+ [CCode (cname = "MoonshotError", free_function = "moonshot_error_free")]
+ public class Error {
+ public int code;
+ public string message;
+ }
+
+ /* A service matching rule; duplicated in moonshot-id.vala */
+ [CCode (cname = "MoonshotServiceRule")]
+ public struct ServiceRule {
+ public string pattern;
+ public string always_confirm;
+ }
+
+ [CCode (cname = "moonshot_get_identity")]
+ public bool get_identity (string nai,
+ string password,
+ string service,
+ out string nai_out,
+ out string password_out,
+ out string server_certificate_hash_out,
+ out string ca_certificate_out,
+ out string subject_name_constraint_out,
+ out string subject_alt_name_constraint_out,
+ out Moonshot.Error error);
+
+ [CCode (cname = "moonshot_get_default_identity")]
+ public bool get_default_identity (out string nai_out,
+ out string password_out,
+ out string server_certificate_hash_out,
+ out string ca_certificate_out,
+ out string subject_name_constraint_out,
+ out string subject_alt_name_constraint_out,
+ out Moonshot.Error error);
+
+ [CCode (cname = "moonshot_install_id_card")]
+ public bool install_id_card (string display_name,
+ string? user_name,
+ string? password,
+ string? realm,
+ string rules_patterns[],
+ string rules_always_confirm[],
+ string services[],
+ string? ca_cert,
+ string? subject,
+ string? subject_alt,
+ string? server_cert,
+ out Moonshot.Error error);
+}
[out, string] char **ca_certificate,
[out, string] char **subject_name_constraint,
[out, string] char **subject_alt_name_constraint);
-}
+ int moonshot_install_id_card_rpc ([in, string] const char *display_name,
+ [in, string] const char *user_name,
+ [in, string] const char *password,
+ [in, string] const char *realm,
+ [size_is(rules_patterns_length), in, string] char *rules_patterns[*],
+ int rules_patterns_length,
+ [size_is(rules_always_confirm_length), in, string] char *rules_always_confirm[*],
+ int rules_always_confirm_length,
+ [size_is(services_length), in, string] char *services[*],
+ int services_length,
+ [in, string] const char *ca_cert,
+ [in, string] const char *subject,
+ [in, string] const char *subject_alt,
+ [in, string] const char *server_cert);
+}
public TrustAnchor trust_anchor { get; set; default = new TrustAnchor (); }
- public Gdk.Pixbuf pixbuf { get; set; default = null; }
-
//TODO: Set the getter and remove the setter/default
public unowned string nai { get { _nai = username + "@" + password; return _nai;}}
}
update_id_card_label ()
{
string services_text = "";
+
var display_name = Markup.printf_escaped ("<b>%s</b>", this.id_card.display_name);
for (int i=0; i<id_card.services.length; i++)
{
{
this.id_card = id_card;
- var image = new Image.from_pixbuf (id_card.pixbuf);
+ var image = new Image.from_pixbuf (id_card.get_data ("pixbuf"));
label = new Label (null);
label.set_alignment ((float) 0, (float) 0.5);
id_card.password = key_file.get_string (identity, "Password");
id_card.services = key_file.get_string_list (identity, "Services");
id_card.display_name = key_file.get_string (identity, "DisplayName");
- id_card.pixbuf = find_icon ("avatar-default", 48);
+ id_card.set_data ("pixbuf", find_icon ("avatar-default", 48));
id_card_list.prepend (id_card);
}
[CCode (cname = "moonshot_binding_handle")]
public BindingHandle binding_handle;
+ [CCode (cname = "MoonshotServiceRule_RPC")]
+ public struct Rule_RPC {
+ string pattern;
+ string always_confirm;
+ }
+
[CCode (cname = "moonshot_get_identity_rpc")]
public extern void get_identity (Rpc.AsyncCall call,
string nai,
return false;
}
-
+
public async bool install_id_card (string display_name,
string user_name,
string password,
string server_cert)
{
IdCard idcard = new IdCard ();
-
+
idcard.display_name = display_name;
idcard.username = user_name;
idcard.password = password;
idcard.trust_anchor.subject = subject;
idcard.trust_anchor.subject_alt = subject_alt;
idcard.trust_anchor.server_cert = server_cert;
-
+
if (rules_patterns.length == rules_always_confirm.length)
{
idcard.rules = new Rule[rules_patterns.length];
}
}
- /* TODO: Check if display name already exists */
-
- idcard.pixbuf = find_icon ("avatar-default", 48);
-
- var dialog = new Gtk.MessageDialog (main_window,
- Gtk.DialogFlags.DESTROY_WITH_PARENT,
- Gtk.MessageType.QUESTION,
- Gtk.ButtonsType.YES_NO,
- _("Would you like to add '%s' ID Card to the ID Card Organizer?"),
- idcard.display_name);
-
- dialog.show_all ();
- var ret = dialog.run ();
- dialog.hide ();
-
- if (ret == Gtk.ResponseType.YES)
- {
- main_window.insert_id_card (idcard);
- return true;
- }
-
- return false;
+ return this.main_window.insert_id_card (idcard);
}
-
}
#elif IPC_MSRPC
request.cond.wait (request.mutex);
request.mutex.unlock ();
}
+
+ [CCode (cname = "moonshot_install_id_card_rpc")]
+ public static bool install_id_card (string display_name,
+ string user_name,
+ string password,
+ string realm,
+ string[] rules_patterns,
+ string[] rules_always_confirm,
+ string[] services,
+ string ca_cert,
+ string subject,
+ string subject_alt,
+ string server_cert)
+ {
+ IdCard idcard = new IdCard ();
+ bool success = false;
+ Mutex mutex = new Mutex();
+ Cond cond = new Cond();
+
+ idcard.display_name = display_name;
+ idcard.username = user_name;
+ idcard.password = password;
+ idcard.issuer = realm;
+ idcard.services = services;
+ idcard.trust_anchor.ca_cert = ca_cert;
+ idcard.trust_anchor.subject = subject;
+ idcard.trust_anchor.subject_alt = subject_alt;
+ idcard.trust_anchor.server_cert = server_cert;
+
+ if (rules_patterns.length == rules_always_confirm.length)
+ {
+ idcard.rules = new Rule[rules_patterns.length];
+
+ for (int i=0; i<idcard.rules.length; i++)
+ {
+ idcard.rules[i].pattern = rules_patterns[i];
+ idcard.rules[i].always_confirm = rules_always_confirm[i];
+ }
+ }
+
+ mutex.lock ();
+
+ // Defer addition to the main loop thread.
+ Idle.add (() => {
+ mutex.lock ();
+ success = main_window.add_identity (idcard);
+ cond.signal ();
+ mutex.unlock ();
+ return false;
+ });
+
+ cond.wait (mutex);
+ mutex.unlock ();
+
+ return success;
+ }
}
#endif
// Hack to allow running within the source tree
int last_dir_index = base_path.last_index_of_char ('\\');
- if (base_path.substring (last_dir_index) == "\\src")
+ if (base_path.substring (last_dir_index) == "\\.libs" || base_path.substring (last_dir_index) == "src")
base_path = base_path.slice(0, last_dir_index);
string? filename = Path.build_filename (base_path, "share", "icons", "%s.png".printf (name));
-namespace Moonshot
-{
- [DBus (name = "org.janet.Moonshot")]
- public interface MoonshotServer : Object
- {
- public async abstract bool get_identity (string nai,
- string password,
- string service,
- out string nai_out,
- out string password_out,
- out string server_certificate_hash,
- out string ca_certificate,
- out string subject_name_constraint,
- out string subject_alt_name_constraint)
- throws DBus.Error;
-
- public async abstract bool get_default_identity (out string nai_out,
- out string password_out,
- out string server_certificate_hash,
- out string ca_certificate,
- out string subject_name_constraint,
- out string subject_alt_name_constraint)
- throws DBus.Error;
-
- public async abstract bool install_id_card (string display_name,
- string user_name,
- string password,
- string realm,
- string[] rules_patterns,
- string[] rules_always_confirm,
- string[] services,
- string ca_cert,
- string subject,
- string subject_alt,
- string server_cert)
- throws DBus.Error;
- }
-}
-
+using Moonshot;
namespace WebProvisioning
{
while ((line = dis.read_line (null)) != null)
text += line;
}
- catch (Error e)
+ catch (GLib.Error e)
{
error ("Could not retreive file size");
}
{
ctx.parse (text, text.length);
}
- catch (Error e)
+ catch (GLib.Error e)
{
error ("Could not parse %s, invalid content", path);
}
foreach (IdCard card in cards)
{
- try
- {
- var conn = DBus.Bus.get (DBus.BusType.SESSION);
- dynamic DBus.Object bus = conn.get_object ("org.janet.Moonshot",
- "/org/janet/moonshot",
- "org.janet.Moonshot");
-
- string[] rules_patterns = {};
- string[] rules_always_confirm = {};
+ Moonshot.Error error;
+ string[] rules_patterns = {};
+ string[] rules_always_confirm = {};
- if (card.rules.length > 0)
+ if (card.rules.length > 0)
+ {
+ int i = 0;
+ rules_patterns = new string[card.rules.length];
+ rules_always_confirm = new string[card.rules.length];
+ foreach (Rule r in card.rules)
{
- int i = 0;
- rules_patterns = new string[card.rules.length];
- rules_always_confirm = new string[card.rules.length];
- foreach (Rule r in card.rules)
- {
- rules_patterns[i] = r.pattern;
- rules_always_confirm[i] = r.always_confirm;
- i++;
- }
+ rules_patterns[i] = r.pattern;
+ rules_always_confirm[i] = r.always_confirm;
+ i++;
}
-
- bus.install_id_card (card.display_name,
- card.username,
- card.password,
- card.issuer,
- rules_patterns,
- rules_always_confirm,
- card.services,
- card.trust_anchor.ca_cert,
- card.trust_anchor.subject,
- card.trust_anchor.subject_alt,
- card.trust_anchor.server_cert);
-
}
- catch (Error e)
+
+ Moonshot.install_id_card (card.display_name,
+ card.username,
+ card.password,
+ card.issuer,
+ rules_patterns,
+ rules_always_confirm,
+ card.services,
+ card.trust_anchor.ca_cert,
+ card.trust_anchor.subject,
+ card.trust_anchor.subject_alt,
+ card.trust_anchor.server_cert,
+ out error);
+
+ if (error != null)
{
- stderr.printf ("Error: %s", e.message);
+ stderr.printf ("Error: %s", error.message);
continue;
}
}
id_card.issuer = "Issuer";
id_card.username = dialog.username;
id_card.password = dialog.password;
- id_card.pixbuf = find_icon ("avatar-default", 48);
id_card.services = {};
+ id_card.set_data("pixbuf", find_icon ("avatar-default", 48));
return id_card;
}
private void add_id_card_data (IdCard id_card)
{
- TreeIter iter;
+ TreeIter iter;
+ Gdk.Pixbuf pixbuf;
this.listmodel.append (out iter);
+ pixbuf = id_card.get_data("pixbuf");
listmodel.set (iter,
Columns.IDCARD_COL, id_card,
- Columns.LOGO_COL, id_card.pixbuf,
+ Columns.LOGO_COL, pixbuf,
Columns.ISSUER_COL, id_card.issuer,
Columns.USERNAME_COL, id_card.username,
Columns.PASSWORD_COL, id_card.password);
id_card_widget.expanded.connect (fill_details);
}
- private void add_identity (AddIdentityDialog dialog)
- {
- insert_id_card (get_id_card_data (dialog));
- }
-
/* This method finds a valid display name */
public bool display_name_is_valid (string name,
out string? candidate)
add_id_card_widget (id_card);
}
- private void add_identity_cb ()
+ public bool add_identity (IdCard id_card)
+ {
+ /* TODO: Check if display name already exists */
+
+ var dialog = new Gtk.MessageDialog (this,
+ Gtk.DialogFlags.DESTROY_WITH_PARENT,
+ Gtk.MessageType.QUESTION,
+ Gtk.ButtonsType.YES_NO,
+ _("Would you like to add '%s' ID Card to the ID Card Organizer?"),
+ id_card.display_name);
+
+ dialog.show_all ();
+ var ret = dialog.run ();
+ dialog.hide ();
+
+ if (ret == Gtk.ResponseType.YES) {
+ id_card.set_data ("pixbuf", find_icon ("avatar-default", 48));
+ this.insert_id_card (id_card);
+ return true;
+ }
+
+ return false;
+ }
+
+ private void add_identity_manual_cb ()
{
var dialog = new AddIdentityDialog ();
var result = dialog.run ();
switch (result) {
case ResponseType.OK:
- add_identity (dialog);
+ insert_id_card (get_id_card_data (dialog));
break;
default:
break;
N_("Add ID Card"),
null,
N_("Add a new ID Card"),
- add_identity_cb };
+ add_identity_manual_cb };
actions += add;
Gtk.ActionEntry quit = { "QuitAction",
#if VALA_0_12
projects / moonshot-ui.git / commitdiff