Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

jappixmini: split into several program files, eJabberd extauth script…

…, list of known jabber addresses
  • Loading branch information...
commit 9ccd2e85758d616d1a92338644d868cc66b25b47 1 parent db9593c
@Leberwurscht authored
View
4 jappixmini/README
@@ -11,8 +11,8 @@ provider, but keep in mind that only personal usage is approved according to
http://codingteam.net/project/jappix/doc/BoshServer.
If you have a larger server, it is recommended that you install your own BOSH
server and recommend it using the configuration help field. If it is on the
-same server, you can also deactivate the BOSH proxy. This should improve the
-performance.
+same server and port, you can also deactivate the BOSH proxy. This should
+improve the performance.
The addon has an experimental autosubscribe and autosuggest functionality which
tries to add your Friendica contacts to your roster automatically.
View
228 jappixmini/address_discovery.php
@@ -0,0 +1,228 @@
+<?php
+//
+// Copyright 2012 "Leberwurscht" <leberwurscht@hoegners.de>
+//
+// This file is dual-licensed under the MIT license (see MIT.txt) and the AGPL license (see jappix/COPYING).
+//
+
+/*
+
+Problem:
+How to discover the jabber addresses of the friendica contacts?
+
+Solution:
+Each Friendica site with this addon provides a /jappixmini/ module page. We go through our contacts and retrieve
+this information every week using a cron hook.
+
+Problem:
+We do not want to make the jabber address public.
+
+Solution:
+When two friendica users connect using DFRN, the relation gets a DFRN ID and a keypair is generated.
+Using this keypair, we can provide the jabber address only to contacts:
+
+Alice:
+ signed_address = openssl_*_encrypt(alice_jabber_address)
+send signed_address to Bob, who does
+ trusted_address = openssl_*_decrypt(signed_address)
+ save trusted_address
+ encrypted_address = openssl_*_encrypt(bob_jabber_address)
+reply with encrypted_address to Alice, who does
+ decrypted_address = openssl_*_decrypt(encrypted_address)
+ save decrypted_address
+
+Interface for this:
+GET /jappixmini/?role=%s&signed_address=%s&dfrn_id=%s
+(or better, using POST to avoid too long URLs)
+
+Response:
+json({"status":"ok", "encrypted_address":"%s"})
+
+*/
+
+function jappixmini_serve_addresses($_REQUEST) {
+ // module page where other Friendica sites can submit Jabber addresses to and also can query Jabber addresses
+ // of local users
+
+ // only if role is given
+ $role = $_REQUEST["role"];
+ if (!$role) return;
+
+ $dfrn_id = $_REQUEST["dfrn_id"];
+ if (!$dfrn_id) killme();
+
+ if ($role=="pub") {
+ $r = q("SELECT * FROM `contact` WHERE LENGTH(`pubkey`) AND `dfrn-id`='%s' LIMIT 1",
+ dbesc($dfrn_id)
+ );
+ if (!count($r)) killme();
+
+ $encrypt_func = openssl_public_encrypt;
+ $decrypt_func = openssl_public_decrypt;
+ $key = $r[0]["pubkey"];
+ } else if ($role=="prv") {
+ $r = q("SELECT * FROM `contact` WHERE LENGTH(`prvkey`) AND `issued-id`='%s' LIMIT 1",
+ dbesc($dfrn_id)
+ );
+ if (!count($r)) killme();
+
+ $encrypt_func = openssl_private_encrypt;
+ $decrypt_func = openssl_private_decrypt;
+ $key = $r[0]["prvkey"];
+ } else {
+ killme();
+ }
+
+ $uid = $r[0]["uid"];
+
+ // save the Jabber address we received
+ try {
+ $signed_address_hex = $_REQUEST["signed_address"];
+ $signed_address = hex2bin($signed_address_hex);
+
+ $trusted_address = "";
+ $decrypt_func($signed_address, $trusted_address, $key);
+
+ $now = intval(time());
+ set_pconfig($uid, "jappixmini", "id:$dfrn_id", "$now:$trusted_address");
+ } catch (Exception $e) {
+ }
+
+ // do not return an address if user deactivated plugin
+ $activated = get_pconfig($uid, 'jappixmini', 'activate');
+ if (!$activated) killme();
+
+ // return the requested Jabber address
+ try {
+ if ($server=get_config("jappixmini","provided_server"))
+ {
+ $r = q("SELECT `nickname` FROM `user` WHERE `uid`=%d", $uid);
+ $username = $r[0]["nickname"];
+ }
+ else {
+ $username = get_pconfig($uid, 'jappixmini', 'username');
+ $server = get_pconfig($uid, 'jappixmini', 'server');
+ }
+
+
+ $address = "$username@$server";
+
+ $encrypted_address = "";
+ $encrypt_func($address, $encrypted_address, $key);
+
+ $encrypted_address_hex = bin2hex($encrypted_address);
+
+ $answer = Array(
+ "status"=>"ok",
+ "encrypted_address"=>$encrypted_address_hex
+ );
+
+ $answer_json = json_encode($answer);
+ echo $answer_json;
+ killme();
+ } catch (Exception $e) {
+ killme();
+ }
+}
+
+function jappixmini_discover_addresses() {
+ // go through list of users with jabber enabled
+ $users = q("SELECT `uid` FROM `pconfig` WHERE `cat`='jappixmini' AND (`k`='autosubscribe' OR `k`='autoapprove') AND `v`='1'");
+ logger("jappixmini: Update list of contacts' jabber accounts for ".count($users)." users.");
+
+ foreach ($users as $row) {
+ $uid = $row["uid"];
+
+ // for each user, go through list of contacts
+ $contacts = q("SELECT * FROM `contact` WHERE `uid`=%d AND ((LENGTH(`dfrn-id`) AND LENGTH(`pubkey`)) OR (LENGTH(`issued-id`) AND LENGTH(`prvkey`)))", intval($uid));
+ foreach ($contacts as $contact_row) {
+ $request = $contact_row["request"];
+ if (!$request) continue;
+
+ $dfrn_id = $contact_row["dfrn-id"];
+ if ($dfrn_id) {
+ $key = $contact_row["pubkey"];
+ $encrypt_func = openssl_public_encrypt;
+ $decrypt_func = openssl_public_decrypt;
+ $role = "prv";
+ } else {
+ $dfrn_id = $contact_row["issued-id"];
+ $key = $contact_row["prvkey"];
+ $encrypt_func = openssl_private_encrypt;
+ $decrypt_func = openssl_private_decrypt;
+ $role = "pub";
+ }
+
+ // check if jabber address already present
+ $present = get_pconfig($uid, "jappixmini", "id:".$dfrn_id);
+ $now = intval(time());
+ if ($present) {
+ // $present has format "timestamp:jabber_address"
+ $p = strpos($present, ":");
+ $timestamp = intval(substr($present, 0, $p));
+
+ // do not re-retrieve jabber address if last retrieval
+ // is not older than a week
+ if ($now-$timestamp<3600*24*7) continue;
+ }
+
+ // construct retrieval address
+ $pos = strpos($request, "/dfrn_request/");
+ if ($pos===false) continue;
+
+ $url = substr($request, 0, $pos)."/jappixmini?role=$role";
+
+ // construct own address
+ if ($server=get_config("jappixmini","provided_server"))
+ {
+ $r = q("SELECT `nickname` FROM `user` WHERE `uid`=%d", $uid);
+ $username = $r[0]["nickname"];
+ }
+ else {
+ $username = get_pconfig($uid, 'jappixmini', 'username');
+ if (!$username) continue;
+ $server = get_pconfig($uid, 'jappixmini', 'server');
+ if (!$server) continue;
+ }
+
+ $address = $username."@".$server;
+
+ // sign address
+ $signed_address = "";
+ $encrypt_func($address, $signed_address, $key);
+
+ // construct request parameters
+ $signed_address_hex = bin2hex($signed_address);
+ $params = array();
+ $params["signed_address"] = $signed_address_hex;
+ $params["dfrn_id"] = $dfrn_id;
+
+ try {
+ // send request
+ $answer_json = post_url($url, $params);
+
+ // parse answer
+ $answer = json_decode($answer_json);
+ if ($answer->status != "ok") throw new Exception();
+
+ $encrypted_address_hex = $answer->encrypted_address;
+ if (!$encrypted_address_hex) throw new Exception();
+
+ $encrypted_address = hex2bin($encrypted_address_hex);
+ if (!$encrypted_address) throw new Exception();
+
+ // decrypt address
+ $decrypted_address = "";
+ $decrypt_func($encrypted_address, $decrypted_address, $key);
+ if (!$decrypted_address) throw new Exception();
+ } catch (Exception $e) {
+ $decrypted_address = "";
+ }
+
+ // save address
+ set_pconfig($uid, "jappixmini", "id:$dfrn_id", "$now:$decrypted_address");
+ }
+ }
+}
+
+?>
View
68 jappixmini/administration.php
@@ -0,0 +1,68 @@
+<?php
+//
+// Copyright 2012 "Leberwurscht" <leberwurscht@hoegners.de>
+//
+// This file is dual-licensed under the MIT license (see MIT.txt) and the AGPL license (see jappix/COPYING).
+//
+
+function jappixmini_plugin_admin(&$a, &$o) {
+ // display instructions and warnings on addon settings page for admin
+
+ if (!file_exists("addon/jappixmini.tgz")) {
+ $o .= '<p><strong style="color:#fff;background-color:#f00">The source archive jappixmini.tgz does not exist. This is probably a violation of the Jappix License (AGPL).</strong></p>';
+ }
+
+ // warn if cron job has not yet been executed
+ $cron_run = get_config("jappixmini", "last_cron_execution");
+ if (!$cron_run) $o .= "<p><strong>Warning: The cron job has not yet been executed. If this message is still there after some time (usually 10 minutes), this means that autosubscribe and autoaccept will not work.</strong></p>";
+
+ // bosh proxy
+ $bosh_proxy = intval(get_config("jappixmini", "bosh_proxy"));
+ $bosh_proxy = $bosh_proxy ? ' checked="checked"' : '';
+ $o .= '<label for="jappixmini-proxy">Activate BOSH proxy</label>';
+ $o .= ' <input id="jappixmini-proxy" type="checkbox" name="jappixmini-proxy" value="1"'.$bosh_proxy.' /><br />';
+ $o .= '<p style="margin-left:2em;">This is needed for older Browsers which do not support CORS.</p>';
+
+ // ejabberd extauth target
+ $extauth = intval(get_config("jappixmini", "extauth"));
+ $extauth = $extauth ? ' checked="checked"' : '';
+ $provided_server = htmlentities(get_config("jappixmini", "provided_server"));
+ $provided_bosh = htmlentities(get_config("jappixmini", "provided_bosh"));
+ $o .= '<label for="jappixmini-extauth">Activate target for eJabberd <a href="'.$a->get_baseurl().'/jappixmini/extauth_script">extauth script</a></label>';
+ $o .= ' <input id="jappixmini-extauth" type="checkbox" name="jappixmini-extauth" value="1"'.$extauth.' /><br />';
+ $o .= '<p style="margin-left:2em;"><label for="jappixmini-provided-server">Provided server</label> <input type="text" name="jappixmini-provided-server" value="'.$provided_server.'"><br /><label for="jappixmini-provided-bosh">Provided BOSH host</label> <input type="text" name="jappixmini-provided-bosh" value="'.$provided_bosh.'"></p>';
+// Jabber server / BOSH proxy / enable automatically</p>';
+
+ // info text field
+ $info_text = get_config("jappixmini", "infotext");
+ $o .= '<p><label for="jappixmini-infotext">Info text to help users with configuration (important if you want to provide your own BOSH host!):</label><br />';
+ $o .= '<textarea id="jappixmini-infotext" name="jappixmini-infotext" rows="5" cols="50">'.htmlentities($info_text).'</textarea></p>';
+
+ // submit button
+ $o .= '<input type="submit" name="jappixmini-admin-settings" value="OK" />';
+}
+
+function jappixmini_plugin_admin_post(&$a) {
+ // set info text
+ $submit = $_REQUEST['jappixmini-admin-settings'];
+ if ($submit) {
+ $info_text = $_REQUEST['jappixmini-infotext'];
+ $bosh_proxy = intval($_REQUEST['jappixmini-proxy']);
+ $extauth = intval($_REQUEST['jappixmini-extauth']);
+ $provided_server = $_REQUEST['jappixmini-provided-server'];
+ $provided_bosh = $_REQUEST['jappixmini-provided-bosh'];
+ set_config("jappixmini", "infotext", $info_text);
+ set_config("jappixmini", "bosh_proxy", $bosh_proxy);
+ set_config("jappixmini", "extauth", $extauth);
+
+ // delete address cache so that new addresses are pushed to contacts
+ if ($provided_server != get_config("jappixmini","provided_server")) {
+ q("DELETE FROM `pconfig` WHERE `cat`='jappixmini' AND `k` LIKE 'id:%%'");
+ set_config("jappixmini", "provided_server", $provided_server);
+ }
+
+ set_config("jappixmini", "provided_bosh", $provided_bosh);
+ }
+}
+
+?>
View
129 jappixmini/extauth.php
@@ -0,0 +1,129 @@
+<?php
+//
+// Copyright 2012 "Leberwurscht" <leberwurscht@hoegners.de>
+//
+// This file is dual-licensed under the MIT license (see MIT.txt) and the AGPL license (see jappix/COPYING).
+//
+
+function jappixmini_extauth() {
+ if (!intval(get_config("jappixmini", "extauth"))) killme();
+
+ header("Content-type: text/plain");
+
+ if ($_REQUEST["extauth"]=="auth") {
+ $username = $_REQUEST["username"];
+ $password = $_REQUEST["password"];
+
+ // try session id
+ $uid = local_user();
+ $r = q("SELECT * FROM `user` WHERE `nickname`='%s' AND `uid`='%d'",
+ dbesc($username),
+ $uid
+ );
+ if (count($r)) {
+ echo "1";
+ killme();
+ }
+
+ // try friendica password
+ $encrypted = hash('whirlpool',$password);
+ $r = q("SELECT * FROM `user` WHERE `nickname`='%s' AND `password`='%s'",
+ dbesc($username),
+ dbesc($encrypted)
+ );
+ if (count($r)) {
+ echo "1";
+ killme();
+ }
+
+ echo "0";
+ killme();
+ }
+ else if ($_REQUEST["extauth"]=="isuser") {
+ $username = $_REQUEST["username"];
+
+ $r = q("SELECT * FROM `user` WHERE `nickname`='%s'",
+ dbesc($username)
+ );
+ if (count($r)) echo "1";
+ else echo "0";
+
+ killme();
+ }
+ else {
+ echo "0";
+ killme();
+ }
+
+}
+
+function jappixmini_extauth_script($a) {
+ if (!intval(get_config("jappixmini", "extauth"))) killme();
+
+ $secret = get_config("jappixmini", "extauth-secret");
+ if (!$secret) {
+ $secret = random_string();
+ set_config("jappixmini", "extauth-secret", $secret);
+ }
+
+ header("Content-type: text/plain");
+
+ // extauth script
+ echo "#!/usr/bin/env python\n\n";
+ echo "TARGET_URL = '".addslashes($a->get_baseurl())."/jappixmini/extauth/'\n\n";
+
+ echo <<<EOF
+import sys
+from urllib import urlencode
+import struct, urllib2
+
+while True:
+ announcement = sys.stdin.read(2)
+ length, = struct.unpack("!h", announcement)
+ string = sys.stdin.read(length)
+
+ opener = urllib2.build_opener()
+ data = {}
+
+ try:
+ parts = string.split(":")
+ if parts[0]=="auth":
+ username = parts[1]
+ # server = parts[2]
+ password = parts[3]
+
+ data["extauth"] = "auth"
+ data["username"] = username
+
+ if password.startswith("PHPSESSID="):
+ marker, sessid = password.split("=", 1)
+ cookie = urlencode({"PHPSESSID":sessid})
+ opener.addheaders.append(("Cookie", cookie))
+ else:
+ data["password"] = password
+ elif parts[1]=="isuser":
+ username = parts[1]
+ # server = parts[2]
+
+ data["extauth"] = "isuser"
+ data["username"] = username
+
+ data = urlencode(data)
+ f = opener.open(TARGET_URL, data)
+ response = f.read()
+ response = int(response)
+ if not response in (0,1): raise Exception("Invalid response - must be 0 or 1!")
+ except Exception, e:
+ print >>sys.stderr, e
+ response = 0
+
+ announcement = struct.pack("!h", 2)
+ string = struct.pack("!h", response)
+
+ sys.stdout.write(announcement)
+ sys.stdout.write(string)
+ sys.stdout.flush()
+EOF;
+}
+
+?>
View
139 jappixmini/inject_js.php
@@ -0,0 +1,139 @@
+<?php
+//
+// Copyright 2012 "Leberwurscht" <leberwurscht@hoegners.de>
+//
+// This file is dual-licensed under the MIT license (see MIT.txt) and the AGPL license (see jappix/COPYING).
+//
+
+/*
+
+Problem:
+* jabber password should not be stored on server
+* jabber password should not be sent between server and browser as soon as the user is logged in
+* jabber password should not be reconstructible from communication between server and browser as soon as the user is logged in
+
+Solution:
+Only store an encrypted version of the jabber password on the server. The encryption key is only available to the browser
+and not to the server (at least as soon as the user is logged in). It can be stored using the jappix setDB function.
+
+This encryption key could be the friendica password, but then this password would be stored in the browser in cleartext.
+It is better to use a hash of the password.
+The server should not be able to reconstruct the password, so we can't take the same hash the server stores. But we can
+ use hash("some_prefix"+password). This will however not work with OpenID logins, for this type of login the password must
+be queried manually.
+
+*/
+
+function jappixmini_script(&$a,&$s) {
+ // adds the script to the page header which starts Jappix Mini
+
+ $uid = local_user();
+ if(!$uid) return;
+
+ if (!get_config("jappixmini","provided_server")) {
+ $activate = get_pconfig(local_user(),'jappixmini','activate');
+ $username = get_pconfig(local_user(),'jappixmini','username');
+ $username = str_replace("'", "\\'", $username);
+ $server = get_pconfig(local_user(),'jappixmini','server');
+ $server = str_replace("'", "\\'", $server);
+ $bosh = get_pconfig(local_user(),'jappixmini','bosh');
+ $bosh = str_replace("'", "\\'", $bosh);
+ $encrypt = get_pconfig(local_user(),'jappixmini','encrypt');
+ $encrypt = intval($encrypt);
+ $password = get_pconfig(local_user(),'jappixmini','password');
+ $password = str_replace("'", "\\'", $password);
+
+ $autoapprove = get_pconfig(local_user(),'jappixmini','autoapprove');
+ $autoapprove = intval($autoapprove);
+ $autosubscribe = get_pconfig(local_user(),'jappixmini','autosubscribe');
+ $autosubscribe = intval($autosubscribe);
+ }
+ else {
+ $activate = 1;
+ $r = q("SELECT `nickname` FROM `user` WHERE `uid`=%d", local_user());
+ $username = $r[0]["nickname"];
+ $server = get_config("jappixmini", "provided_server");
+ $bosh = get_config("jappixmini", "provided_bosh");
+ $encrypt = 0;
+ $password = 'PHPSESSID='.session_id();
+ $autoapprove = 1;
+ $autosubscribe = 1;
+ }
+
+ if (!$activate) return;
+
+ $a->page['htmlhead'] .= '<script type="text/javascript" src="' . $a->get_baseurl() . '/addon/jappixmini/jappix/php/get.php?t=js&amp;g=mini.xml"></script>'."\r\n";
+ $a->page['htmlhead'] .= '<script type="text/javascript" src="' . $a->get_baseurl() . '/addon/jappixmini/jappix/php/get.php?t=js&amp;f=presence.js~caps.js~name.js~roster.js"></script>'."\r\n";
+
+ $a->page['htmlhead'] .= '<script type="text/javascript" src="' . $a->get_baseurl() . '/addon/jappixmini/lib.js"></script>'."\r\n";
+
+
+ // set proxy if necessary
+ $use_proxy = get_config('jappixmini','bosh_proxy');
+ if ($use_proxy) {
+ $proxy = $a->get_baseurl().'/addon/jappixmini/proxy.php';
+ }
+ else {
+ $proxy = "";
+ }
+
+ // get a list of jabber accounts of the contacts
+ $contacts = Array();
+ $rows = q("SELECT * FROM `pconfig` WHERE `uid`=$uid AND `cat`='jappixmini' AND `k` LIKE 'id:%%'");
+ foreach ($rows as $row) {
+ $key = $row['k'];
+ $pos = strpos($key, ":");
+ $dfrn_id = substr($key, $pos+1);
+ $r = q("SELECT `name` FROM `contact` WHERE `uid`=$uid AND (`dfrn-id`='%s' OR `issued-id`='%s')",
+ dbesc($dfrn_id),
+ dbesc($dfrn_id)
+ );
+ $name = $r[0]["name"];
+
+ $value = $row['v'];
+ $pos = strpos($value, ":");
+ $address = substr($value, $pos+1);
+ if (!$address) continue;
+ if (!$name) $name = $address;
+
+ $contacts[$address] = $name;
+ }
+ $contacts_json = json_encode($contacts);
+ $contacts_hash = sha1($contacts_json);
+
+ // get nickname
+ $r = q("SELECT `username` FROM `user` WHERE `uid`=$uid");
+ $nickname = json_encode($r[0]["username"]);
+
+ // add javascript to start Jappix Mini
+ $a->page['htmlhead'] .= "<script type=\"text/javascript\">
+ jQuery(document).ready(function() {
+ jappixmini_addon_start('$server', '$username', '$proxy', '$bosh', $encrypt, '$password', $nickname, $contacts_json, '$contacts_hash', $autoapprove, $autosubscribe);
+ });
+ </script>";
+
+ return;
+}
+
+function jappixmini_login(&$a, &$o) {
+ // create client secret on login to be able to encrypt jabber passwords
+
+ // for setDB and str_sha1, needed by jappixmini_addon_set_client_secret
+ $a->page['htmlhead'] .= '<script type="text/javascript" src="' . $a->get_baseurl() . '/addon/jappixmini/jappix/php/get.php?t=js&amp;f=datastore.js~jsjac.js"></script>'."\n";
+
+ // for jappixmini_addon_set_client_secret
+ $a->page['htmlhead'] .= '<script type="text/javascript" src="' . $a->get_baseurl() . '/addon/jappixmini/lib.js"></script>'."\n";
+
+ // save hash of password
+ $a->page['htmlhead'] .= '<script type="text/javascript">'."\n";
+ $a->page['htmlhead'] .= ' jQuery(document).ready(function() {'."\n";
+ $a->page['htmlhead'] .= ' var pw_input = document.getElementById("id_password");'."\n";
+ $a->page['htmlhead'] .= ' $(pw_input.form).submit(function(){'."\n";
+ $a->page['htmlhead'] .= ' jappixmini_addon_set_client_secret(pw_input.value);return true;'."\n";
+ $a->page['htmlhead'] .= ' });'."\n";
+ $a->page['htmlhead'] .= ' });'."\n";
+ $a->page['htmlhead'] .= '</script>'."\n";
+}
+
+
+?>
View
603 jappixmini/jappixmini.php
@@ -14,590 +14,93 @@
// This file is dual-licensed under the MIT license (see MIT.txt) and the AGPL license (see jappix/COPYING).
//
-/*
+require_once("address_discovery.php");
+require_once("inject_js.php");
+require_once("user_settings.php");
+require_once("administration.php");
+require_once("legal.php");
-Problem:
-* jabber password should not be stored on server
-* jabber password should not be sent between server and browser as soon as the user is logged in
-* jabber password should not be reconstructible from communication between server and browser as soon as the user is logged in
-
-Solution:
-Only store an encrypted version of the jabber password on the server. The encryption key is only available to the browser
-and not to the server (at least as soon as the user is logged in). It can be stored using the jappix setDB function.
-
-This encryption key could be the friendica password, but then this password would be stored in the browser in cleartext.
-It is better to use a hash of the password.
-The server should not be able to reconstruct the password, so we can't take the same hash the server stores. But we can
- use hash("some_prefix"+password). This will however not work with OpenID logins, for this type of login the password must
-be queried manually.
-
-Problem:
-How to discover the jabber addresses of the friendica contacts?
-
-Solution:
-Each Friendica site with this addon provides a /jappixmini/ module page. We go through our contacts and retrieve
-this information every week using a cron hook.
-
-Problem:
-We do not want to make the jabber address public.
-
-Solution:
-When two friendica users connect using DFRN, the relation gets a DFRN ID and a keypair is generated.
-Using this keypair, we can provide the jabber address only to contacts:
-
-Alice:
- signed_address = openssl_*_encrypt(alice_jabber_address)
-send signed_address to Bob, who does
- trusted_address = openssl_*_decrypt(signed_address)
- save trusted_address
- encrypted_address = openssl_*_encrypt(bob_jabber_address)
-reply with encrypted_address to Alice, who does
- decrypted_address = openssl_*_decrypt(encrypted_address)
- save decrypted_address
-
-Interface for this:
-GET /jappixmini/?role=%s&signed_address=%s&dfrn_id=%s
-(or better, using POST to avoid too long URLs)
-
-Response:
-json({"status":"ok", "encrypted_address":"%s"})
-
-*/
+require_once("extauth.php");
function jappixmini_install() {
-register_hook('plugin_settings', 'addon/jappixmini/jappixmini.php', 'jappixmini_settings');
-register_hook('plugin_settings_post', 'addon/jappixmini/jappixmini.php', 'jappixmini_settings_post');
+ register_hook('plugin_settings', 'addon/jappixmini/jappixmini.php', 'jappixmini_settings');
+ register_hook('plugin_settings_post', 'addon/jappixmini/jappixmini.php', 'jappixmini_settings_post');
-register_hook('page_end', 'addon/jappixmini/jappixmini.php', 'jappixmini_script');
-register_hook('login_hook', 'addon/jappixmini/jappixmini.php', 'jappixmini_login');
+ register_hook('page_end', 'addon/jappixmini/jappixmini.php', 'jappixmini_script');
+ register_hook('login_hook', 'addon/jappixmini/jappixmini.php', 'jappixmini_login');
-register_hook('cron', 'addon/jappixmini/jappixmini.php', 'jappixmini_cron');
+ register_hook('cron', 'addon/jappixmini/jappixmini.php', 'jappixmini_cron');
-// Jappix source download as required by AGPL
-register_hook('about_hook', 'addon/jappixmini/jappixmini.php', 'jappixmini_download_source');
+ // Jappix source download as required by AGPL
+ register_hook('about_hook', 'addon/jappixmini/jappixmini.php', 'jappixmini_download_source');
-// set standard configuration
-$info_text = get_config("jappixmini", "infotext");
-if (!$info_text) set_config("jappixmini", "infotext",
- "To get the chat working, you need to know a BOSH host which works with your Jabber account. ".
- "An example of a BOSH server that works for all accounts is https://bind.jappix.com/, but keep ".
- "in mind that the BOSH server can read along all chat messages. If you know that your Jabber ".
- "server also provides an own BOSH server, it is much better to use this one!"
-);
+ // set standard configuration
+ $info_text = get_config("jappixmini", "infotext");
+ if (!$info_text) set_config("jappixmini", "infotext",
+ "To get the chat working, you need to know a BOSH host which works with your Jabber account. ".
+ "An example of a BOSH server that works for all accounts is https://bind.jappix.com/, but keep ".
+ "in mind that the BOSH server can read along all chat messages. If you know that your Jabber ".
+ "server also provides an own BOSH server, it is much better to use this one!"
+ );
-$bosh_proxy = get_config("jappixmini", "bosh_proxy");
-if ($bosh_proxy==="") set_config("jappixmini", "bosh_proxy", "1");
+ $bosh_proxy = get_config("jappixmini", "bosh_proxy");
+ if ($bosh_proxy==="") set_config("jappixmini", "bosh_proxy", "1");
-// set addon version so that safe updates are possible later
-$addon_version = get_config("jappixmini", "version");
-if ($addon_version==="") set_config("jappixmini", "version", "1");
+ // set addon version so that safe updates are possible later
+ $addon_version = get_config("jappixmini", "version");
+ if ($addon_version==="") set_config("jappixmini", "version", "1");
}
function jappixmini_uninstall() {
-unregister_hook('plugin_settings', 'addon/jappixmini/jappixmini.php', 'jappixmini_settings');
-unregister_hook('plugin_settings_post', 'addon/jappixmini/jappixmini.php', 'jappixmini_settings_post');
-
-unregister_hook('page_end', 'addon/jappixmini/jappixmini.php', 'jappixmini_script');
-unregister_hook('login_hook', 'addon/jappixmini/jappixmini.php', 'jappixmini_login');
+ unregister_hook('plugin_settings', 'addon/jappixmini/jappixmini.php', 'jappixmini_settings');
+ unregister_hook('plugin_settings_post', 'addon/jappixmini/jappixmini.php', 'jappixmini_settings_post');
-unregister_hook('cron', 'addon/jappixmini/jappixmini.php', 'jappixmini_cron');
+ unregister_hook('page_end', 'addon/jappixmini/jappixmini.php', 'jappixmini_script');
+ unregister_hook('login_hook', 'addon/jappixmini/jappixmini.php', 'jappixmini_login');
-unregister_hook('about_hook', 'addon/jappixmini/jappixmini.php', 'jappixmini_download_source');
+ unregister_hook('cron', 'addon/jappixmini/jappixmini.php', 'jappixmini_cron');
-// purge lists of jabber addresses
-q("DELETE FROM `pconfig` WHERE `cat`='jappixmini' AND `k` LIKE 'id:%%'");
-}
-
-function jappixmini_plugin_admin(&$a, &$o) {
- // display instructions and warnings on addon settings page for admin
-
- if (!file_exists("addon/jappixmini.tgz")) {
- $o .= '<p><strong style="color:#fff;background-color:#f00">The source archive jappixmini.tgz does not exist. This is probably a violation of the Jappix License (AGPL).</strong></p>';
- }
-
- // warn if cron job has not yet been executed
- $cron_run = get_config("jappixmini", "last_cron_execution");
- if (!$cron_run) $o .= "<p><strong>Warning: The cron job has not yet been executed. If this message is still there after some time (usually 10 minutes), this means that autosubscribe and autoaccept will not work.</strong></p>";
-
- // bosh proxy
- $bosh_proxy = intval(get_config("jappixmini", "bosh_proxy"));
- $bosh_proxy = intval($bosh_proxy) ? ' checked="checked"' : '';
- $o .= '<label for="jappixmini-proxy">Activate BOSH proxy</label>';
- $o .= ' <input id="jappixmini-proxy" type="checkbox" name="jappixmini-proxy" value="1"'.$bosh_proxy.' /><br />';
-
- // info text field
- $info_text = get_config("jappixmini", "infotext");
- $o .= '<p><label for="jappixmini-infotext">Info text to help users with configuration (important if you want to provide your own BOSH host!):</label><br />';
- $o .= '<textarea id="jappixmini-infotext" name="jappixmini-infotext" rows="5" cols="50">'.htmlentities($info_text).'</textarea></p>';
-
- // submit button
- $o .= '<input type="submit" name="jappixmini-admin-settings" value="OK" />';
-}
+ unregister_hook('about_hook', 'addon/jappixmini/jappixmini.php', 'jappixmini_download_source');
-function jappixmini_plugin_admin_post(&$a) {
- // set info text
- $submit = $_REQUEST['jappixmini-admin-settings'];
- if ($submit) {
- $info_text = $_REQUEST['jappixmini-infotext'];
- $bosh_proxy = intval($_REQUEST['jappixmini-proxy']);
- set_config("jappixmini", "infotext", $info_text);
- set_config("jappixmini", "bosh_proxy", $bosh_proxy);
- }
+ // purge lists of jabber addresses
+ q("DELETE FROM `pconfig` WHERE `cat`='jappixmini' AND `k` LIKE 'id:%%'");
}
function jappixmini_module() {}
function jappixmini_init(&$a) {
- // module page where other Friendica sites can submit Jabber addresses to and also can query Jabber addresses
- // of local users
-
- // only if role is given
- $role = $_REQUEST["role"];
- if (!$role) return;
-
- $dfrn_id = $_REQUEST["dfrn_id"];
- if (!$dfrn_id) killme();
-
- if ($role=="pub") {
- $r = q("SELECT * FROM `contact` WHERE LENGTH(`pubkey`) AND `dfrn-id`='%s' LIMIT 1",
- dbesc($dfrn_id)
- );
- if (!count($r)) killme();
-
- $encrypt_func = openssl_public_encrypt;
- $decrypt_func = openssl_public_decrypt;
- $key = $r[0]["pubkey"];
- } else if ($role=="prv") {
- $r = q("SELECT * FROM `contact` WHERE LENGTH(`prvkey`) AND `issued-id`='%s' LIMIT 1",
- dbesc($dfrn_id)
- );
- if (!count($r)) killme();
-
- $encrypt_func = openssl_private_encrypt;
- $decrypt_func = openssl_private_decrypt;
- $key = $r[0]["prvkey"];
- } else {
+ if (count($a->argv)==1) {
+ // Path: /jappixmini/
+ // Serve and receive Jabber addresses.
+ jappixmini_serve_addresses($_REQUEST);
killme();
}
-
- $uid = $r[0]["uid"];
-
- // save the Jabber address we received
- try {
- $signed_address_hex = $_REQUEST["signed_address"];
- $signed_address = hex2bin($signed_address_hex);
-
- $trusted_address = "";
- $decrypt_func($signed_address, $trusted_address, $key);
-
- $now = intval(time());
- set_pconfig($uid, "jappixmini", "id:$dfrn_id", "$now:$trusted_address");
- } catch (Exception $e) {
- }
-
- // do not return an address if user deactivated plugin
- $activated = get_pconfig($uid, 'jappixmini', 'activate');
- if (!$activated) killme();
-
- // return the requested Jabber address
- try {
- $username = get_pconfig($uid, 'jappixmini', 'username');
- $server = get_pconfig($uid, 'jappixmini', 'server');
- $address = "$username@$server";
-
- $encrypted_address = "";
- $encrypt_func($address, $encrypted_address, $key);
-
- $encrypted_address_hex = bin2hex($encrypted_address);
-
- $answer = Array(
- "status"=>"ok",
- "encrypted_address"=>$encrypted_address_hex
- );
-
- $answer_json = json_encode($answer);
- echo $answer_json;
+ else if (count($a->argv)==2 && $a->argv[1]=="extauth_script") {
+ // Path: /jappixmini/extauth_script/
+ // Display the ejabberd extauth script for the administrator
+ jappixmini_extauth_script($a);
killme();
- } catch (Exception $e) {
+ }
+ else if (count($a->argv)==2 && $a->argv[1]=="extauth") {
+ // Path: /jappixmini/extauth/
+ // extauth script can validate credentials here
+ jappixmini_extauth();
killme();
}
}
-function jappixmini_settings(&$a, &$s) {
- // addon settings for a user
-
- $activate = get_pconfig(local_user(),'jappixmini','activate');
- $activate = intval($activate) ? ' checked="checked"' : '';
-
- $username = get_pconfig(local_user(),'jappixmini','username');
- $username = htmlentities($username);
- $server = get_pconfig(local_user(),'jappixmini','server');
- $server = htmlentities($server);
- $bosh = get_pconfig(local_user(),'jappixmini','bosh');
- $bosh = htmlentities($bosh);
- $password = get_pconfig(local_user(),'jappixmini','password');
- $autosubscribe = get_pconfig(local_user(),'jappixmini','autosubscribe');
- $autosubscribe = intval($autosubscribe) ? ' checked="checked"' : '';
- $autoapprove = get_pconfig(local_user(),'jappixmini','autoapprove');
- $autoapprove = intval($autoapprove) ? ' checked="checked"' : '';
- $encrypt = intval(get_pconfig(local_user(),'jappixmini','encrypt'));
- $encrypt_checked = $encrypt ? ' checked="checked"' : '';
- $encrypt_disabled = $encrypt ? '' : ' disabled="disabled"';
-
- $info_text = get_config("jappixmini", "infotext");
- $info_text = htmlentities($info_text);
- $info_text = str_replace("\n", "<br />", $info_text);
-
- // count contacts
- $r = q("SELECT COUNT(1) as `cnt` FROM `pconfig` WHERE `uid`=%d AND `cat`='jappixmini' AND `k` LIKE 'id:%%'", local_user());
- if (count($r)) $contact_cnt = $r[0]["cnt"];
- else $contact_cnt = 0;
-
- // count jabber addresses
- $r = q("SELECT COUNT(1) as `cnt` FROM `pconfig` WHERE `uid`=%d AND `cat`='jappixmini' AND `k` LIKE 'id:%%' AND `v` LIKE '%%@%%'", local_user());
- if (count($r)) $address_cnt = $r[0]["cnt"];
- else $address_cnt = 0;
-
- if (!$activate) {
- // load scripts if not yet activated so that password can be saved
- $a->page['htmlhead'] .= '<script type="text/javascript" src="' . $a->get_baseurl() . '/addon/jappixmini/jappix/php/get.php?t=js&amp;g=mini.xml"></script>'."\r\n";
- $a->page['htmlhead'] .= '<script type="text/javascript" src="' . $a->get_baseurl() . '/addon/jappixmini/jappix/php/get.php?t=js&amp;f=presence.js~caps.js~name.js~roster.js"></script>'."\r\n";
-
- $a->page['htmlhead'] .= '<script type="text/javascript" src="' . $a->get_baseurl() . '/addon/jappixmini/lib.js"></script>'."\r\n";
- }
-
- $s .= '<div class="settings-block">';
-
- $s .= '<h3>Jappix Mini addon settings</h3>';
- $s .= '<div>';
- $s .= '<label for="jappixmini-activate">Activate addon</label>';
- $s .= ' <input id="jappixmini-activate" type="checkbox" name="jappixmini-activate" value="1"'.$activate.' />';
- $s .= '<br />';
- $s .= '<label for="jappixmini-username">Jabber username</label>';
- $s .= ' <input id="jappixmini-username" type="text" name="jappixmini-username" value="'.$username.'" />';
- $s .= '<br />';
- $s .= '<label for="jappixmini-server">Jabber server</label>';
- $s .= ' <input id="jappixmini-server" type="text" name="jappixmini-server" value="'.$server.'" />';
- $s .= '<br />';
-
- $s .= '<label for="jappixmini-bosh">Jabber BOSH host</label>';
- $s .= ' <input id="jappixmini-bosh" type="text" name="jappixmini-bosh" value="'.$bosh.'" />';
- $s .= '<br />';
-
- $s .= '<label for="jappixmini-password">Jabber password</label>';
- $s .= ' <input type="hidden" id="jappixmini-password" name="jappixmini-encrypted-password" value="'.$password.'" />';
- $s .= ' <input id="jappixmini-clear-password" type="password" value="" onchange="jappixmini_set_password();" />';
- $s .= '<br />';
- $onchange = "document.getElementById('jappixmini-friendica-password').disabled = !this.checked;jappixmini_set_password();";
- $s .= '<label for="jappixmini-encrypt">Encrypt Jabber password with Friendica password (recommended)</label>';
- $s .= ' <input id="jappixmini-encrypt" type="checkbox" name="jappixmini-encrypt" onchange="'.$onchange.'" value="1"'.$encrypt_checked.' />';
- $s .= '<br />';
- $s .= '<label for="jappixmini-friendica-password">Friendica password</label>';
- $s .= ' <input id="jappixmini-friendica-password" name="jappixmini-friendica-password" type="password" onchange="jappixmini_set_password();" value=""'.$encrypt_disabled.' />';
- $s .= '<br />';
- $s .= '<label for="jappixmini-autoapprove">Approve subscription requests from Friendica contacts automatically</label>';
- $s .= ' <input id="jappixmini-autoapprove" type="checkbox" name="jappixmini-autoapprove" value="1"'.$autoapprove.' />';
- $s .= '<br />';
- $s .= '<label for="jappixmini-autosubscribe">Subscribe to Friendica contacts automatically</label>';
- $s .= ' <input id="jappixmini-autosubscribe" type="checkbox" name="jappixmini-autosubscribe" value="1"'.$autosubscribe.' />';
- $s .= '<br />';
- $s .= '<label for="jappixmini-purge">Purge internal list of jabber addresses of contacts</label>';
- $s .= ' <input id="jappixmini-purge" type="checkbox" name="jappixmini-purge" value="1" />';
- $s .= '<br />';
- if ($info_text) $s .= '<br />Configuration help:<p style="margin-left:2em;">'.$info_text.'</p>';
- $s .= '<br />Status:<p style="margin-left:2em;">Addon knows '.$address_cnt.' Jabber addresses of '.$contact_cnt.' Friendica contacts (takes some time, usually 10 minutes, to update).</p>';
- $s .= '<input type="submit" name="jappixmini-submit" value="' . t('Submit') . '" />';
- $s .= ' <input type="button" value="Add contact" onclick="jappixmini_addon_subscribe();" />';
- $s .= '</div>';
-
- $s .= '</div>';
-
- $a->page['htmlhead'] .= "<script type=\"text/javascript\">
- function jappixmini_set_password() {
- encrypt = document.getElementById('jappixmini-encrypt').checked;
- password = document.getElementById('jappixmini-password');
- clear_password = document.getElementById('jappixmini-clear-password');
- if (encrypt) {
- friendica_password = document.getElementById('jappixmini-friendica-password');
-
- if (friendica_password) {
- jappixmini_addon_set_client_secret(friendica_password.value);
- jappixmini_addon_encrypt_password(clear_password.value, function(encrypted_password){
- password.value = encrypted_password;
- });
- }
- }
- else {
- password.value = clear_password.value;
- }
- }
-
- jQuery(document).ready(function() {
- encrypt = document.getElementById('jappixmini-encrypt').checked;
- password = document.getElementById('jappixmini-password');
- clear_password = document.getElementById('jappixmini-clear-password');
- if (encrypt) {
- jappixmini_addon_decrypt_password(password.value, function(decrypted_password){
- clear_password.value = decrypted_password;
- });
- }
- else {
- clear_password.value = password.value;
- }
- });
- </script>";
-}
-
-function jappixmini_settings_post(&$a,&$b) {
- // save addon settings for a user
-
- if(! local_user()) return;
- $uid = local_user();
-
- if($_POST['jappixmini-submit']) {
- $encrypt = intval($b['jappixmini-encrypt']);
- if ($encrypt) {
- // check that Jabber password was encrypted with correct Friendica password
- $friendica_password = trim($b['jappixmini-friendica-password']);
- $encrypted = hash('whirlpool',$friendica_password);
- $r = q("SELECT * FROM `user` WHERE `uid`=$uid AND `password`='%s'",
- dbesc($encrypted)
- );
- if (!count($r)) {
- info("Wrong friendica password!");
- return;
- }
- }
-
- $purge = intval($b['jappixmini-purge']);
-
- $username = trim($b['jappixmini-username']);
- $old_username = get_pconfig($uid,'jappixmini','username');
- if ($username!=$old_username) $purge = 1;
-
- $server = trim($b['jappixmini-server']);
- $old_server = get_pconfig($uid,'jappixmini','server');
- if ($server!=$old_server) $purge = 1;
-
- $activate = intval($b['jappixmini-activate']);
- $was_activated = get_pconfig($uid,'jappixmini','activate');
- if ($was_activated && !$activate) $purge = 1;
-
- set_pconfig($uid,'jappixmini','username',$username);
- set_pconfig($uid,'jappixmini','server',$server);
- set_pconfig($uid,'jappixmini','bosh',trim($b['jappixmini-bosh']));
- set_pconfig($uid,'jappixmini','password',trim($b['jappixmini-encrypted-password']));
- set_pconfig($uid,'jappixmini','autosubscribe',intval($b['jappixmini-autosubscribe']));
- set_pconfig($uid,'jappixmini','autoapprove',intval($b['jappixmini-autoapprove']));
- set_pconfig($uid,'jappixmini','activate',$activate);
- set_pconfig($uid,'jappixmini','encrypt',$encrypt);
- info( 'Jappix Mini settings saved.' );
-
- if ($purge) {
- q("DELETE FROM `pconfig` WHERE `uid`=$uid AND `cat`='jappixmini' AND `k` LIKE 'id:%%'");
- info( 'List of addresses purged.' );
- }
+function jappixmini_content(&$a) {
+ if (count($a->argv)==2 && $a->argv[1]=="address_list") {
+ // Path: /jappixmini/address_list/
+ // Display the list of Jabber addresses for a user
+ return jappixmini_address_list($a);
}
}
-function jappixmini_script(&$a,&$s) {
- // adds the script to the page header which starts Jappix Mini
-
- if(! local_user()) return;
-
- $activate = get_pconfig(local_user(),'jappixmini','activate');
- if (!$activate) return;
-
- $a->page['htmlhead'] .= '<script type="text/javascript" src="' . $a->get_baseurl() . '/addon/jappixmini/jappix/php/get.php?t=js&amp;g=mini.xml"></script>'."\r\n";
- $a->page['htmlhead'] .= '<script type="text/javascript" src="' . $a->get_baseurl() . '/addon/jappixmini/jappix/php/get.php?t=js&amp;f=presence.js~caps.js~name.js~roster.js"></script>'."\r\n";
-
- $a->page['htmlhead'] .= '<script type="text/javascript" src="' . $a->get_baseurl() . '/addon/jappixmini/lib.js"></script>'."\r\n";
-
- $username = get_pconfig(local_user(),'jappixmini','username');
- $username = str_replace("'", "\\'", $username);
- $server = get_pconfig(local_user(),'jappixmini','server');
- $server = str_replace("'", "\\'", $server);
- $bosh = get_pconfig(local_user(),'jappixmini','bosh');
- $bosh = str_replace("'", "\\'", $bosh);
- $encrypt = get_pconfig(local_user(),'jappixmini','encrypt');
- $encrypt = intval($encrypt);
- $password = get_pconfig(local_user(),'jappixmini','password');
- $password = str_replace("'", "\\'", $password);
-
- $autoapprove = get_pconfig(local_user(),'jappixmini','autoapprove');
- $autoapprove = intval($autoapprove);
- $autosubscribe = get_pconfig(local_user(),'jappixmini','autosubscribe');
- $autosubscribe = intval($autosubscribe);
-
- // set proxy if necessary
- $use_proxy = get_config('jappixmini','bosh_proxy');
- if ($use_proxy) {
- $proxy = $a->get_baseurl().'/addon/jappixmini/proxy.php';
- }
- else {
- $proxy = "";
- }
-
- // get a list of jabber accounts of the contacts
- $contacts = Array();
- $uid = local_user();
- $rows = q("SELECT * FROM `pconfig` WHERE `uid`=$uid AND `cat`='jappixmini' AND `k` LIKE 'id:%%'");
- foreach ($rows as $row) {
- $key = $row['k'];
- $pos = strpos($key, ":");
- $dfrn_id = substr($key, $pos+1);
- $r = q("SELECT `name` FROM `contact` WHERE `uid`=$uid AND (`dfrn-id`='%s' OR `issued-id`='%s')",
- dbesc($dfrn_id),
- dbesc($dfrn_id)
- );
- $name = $r[0]["name"];
-
- $value = $row['v'];
- $pos = strpos($value, ":");
- $address = substr($value, $pos+1);
- if (!$address) continue;
- if (!$name) $name = $address;
-
- $contacts[$address] = $name;
- }
- $contacts_json = json_encode($contacts);
- $contacts_hash = sha1($contacts_json);
-
- // get nickname
- $r = q("SELECT `username` FROM `user` WHERE `uid`=$uid");
- $nickname = json_encode($r[0]["username"]);
-
- // add javascript to start Jappix Mini
- $a->page['htmlhead'] .= "<script type=\"text/javascript\">
- jQuery(document).ready(function() {
- jappixmini_addon_start('$server', '$username', '$proxy', '$bosh', $encrypt, '$password', $nickname, $contacts_json, '$contacts_hash', $autoapprove, $autosubscribe);
- });
- </script>";
-
- return;
-}
-
-function jappixmini_login(&$a, &$o) {
- // create client secret on login to be able to encrypt jabber passwords
-
- // for setDB and str_sha1, needed by jappixmini_addon_set_client_secret
- $a->page['htmlhead'] .= '<script type="text/javascript" src="' . $a->get_baseurl() . '/addon/jappixmini/jappix/php/get.php?t=js&amp;f=datastore.js~jsjac.js"></script>'."\n";
-
- // for jappixmini_addon_set_client_secret
- $a->page['htmlhead'] .= '<script type="text/javascript" src="' . $a->get_baseurl() . '/addon/jappixmini/lib.js"></script>'."\n";
-
- // save hash of password
- $a->page['htmlhead'] .= '<script type="text/javascript">'."\n";
- $a->page['htmlhead'] .= ' jQuery(document).ready(function() {'."\n";
- $a->page['htmlhead'] .= ' var pw_input = document.getElementById("id_password");'."\n";
- $a->page['htmlhead'] .= ' $(pw_input.form).submit(function(){'."\n";
- $a->page['htmlhead'] .= ' jappixmini_addon_set_client_secret(pw_input.value);return true;'."\n";
- $a->page['htmlhead'] .= ' });'."\n";
- $a->page['htmlhead'] .= ' });'."\n";
- $a->page['htmlhead'] .= '</script>'."\n";
-}
-
function jappixmini_cron(&$a, $d) {
// For autosubscribe/autoapprove, we need to maintain a list of jabber addresses of our contacts.
set_config("jappixmini", "last_cron_execution", $d);
- // go through list of users with jabber enabled
- $users = q("SELECT `uid` FROM `pconfig` WHERE `cat`='jappixmini' AND (`k`='autosubscribe' OR `k`='autoapprove') AND `v`='1'");
- logger("jappixmini: Update list of contacts' jabber accounts for ".count($users)." users.");
-
- foreach ($users as $row) {
- $uid = $row["uid"];
-
- // for each user, go through list of contacts
- $contacts = q("SELECT * FROM `contact` WHERE `uid`=%d AND ((LENGTH(`dfrn-id`) AND LENGTH(`pubkey`)) OR (LENGTH(`issued-id`) AND LENGTH(`prvkey`)))", intval($uid));
- foreach ($contacts as $contact_row) {
- $request = $contact_row["request"];
- if (!$request) continue;
-
- $dfrn_id = $contact_row["dfrn-id"];
- if ($dfrn_id) {
- $key = $contact_row["pubkey"];
- $encrypt_func = openssl_public_encrypt;
- $decrypt_func = openssl_public_decrypt;
- $role = "prv";
- } else {
- $dfrn_id = $contact_row["issued-id"];
- $key = $contact_row["prvkey"];
- $encrypt_func = openssl_private_encrypt;
- $decrypt_func = openssl_private_decrypt;
- $role = "pub";
- }
-
- // check if jabber address already present
- $present = get_pconfig($uid, "jappixmini", "id:".$dfrn_id);
- $now = intval(time());
- if ($present) {
- // $present has format "timestamp:jabber_address"
- $p = strpos($present, ":");
- $timestamp = intval(substr($present, 0, $p));
-
- // do not re-retrieve jabber address if last retrieval
- // is not older than a week
- if ($now-$timestamp<3600*24*7) continue;
- }
-
- // construct retrieval address
- $pos = strpos($request, "/dfrn_request/");
- if ($pos===false) continue;
-
- $url = substr($request, 0, $pos)."/jappixmini?role=$role";
-
- // construct own address
- $username = get_pconfig($uid, 'jappixmini', 'username');
- if (!$username) continue;
- $server = get_pconfig($uid, 'jappixmini', 'server');
- if (!$server) continue;
-
- $address = $username."@".$server;
-
- // sign address
- $signed_address = "";
- $encrypt_func($address, $signed_address, $key);
-
- // construct request parameters
- $signed_address_hex = bin2hex($signed_address);
- $params = array();
- $params["signed_address"] = $signed_address_hex;
- $params["dfrn_id"] = $dfrn_id;
-
- try {
- // send request
- $answer_json = post_url($url, $params);
-
- // parse answer
- $answer = json_decode($answer_json);
- if ($answer->status != "ok") throw new Exception();
-
- $encrypted_address_hex = $answer->encrypted_address;
- if (!$encrypted_address_hex) throw new Exception();
-
- $encrypted_address = hex2bin($encrypted_address_hex);
- if (!$encrypted_address) throw new Exception();
-
- // decrypt address
- $decrypted_address = "";
- $decrypt_func($encrypted_address, $decrypted_address, $key);
- if (!$decrypted_address) throw new Exception();
- } catch (Exception $e) {
- $decrypted_address = "";
- }
-
- // save address
- set_pconfig($uid, "jappixmini", "id:$dfrn_id", "$now:$decrypted_address");
- }
- }
-}
-
-function jappixmini_download_source(&$a,&$b) {
- // Jappix Mini source download link on About page
-
- $b .= '<h1>Jappix Mini</h1>';
- $b .= '<p>This site uses the jappixmini addon, which includes Jappix Mini by the <a href="'.$a->get_baseurl().'/addon/jappixmini/jappix/AUTHORS">Jappix authors</a> and is distributed under the terms of the <a href="'.$a->get_baseurl().'/addon/jappixmini/jappix/COPYING">GNU Affero General Public License</a>.</p>';
- $b .= '<p>You can download the <a href="'.$a->get_baseurl().'/addon/jappixmini.tgz">source code of the addon</a>. The rest of Friendica is distributed under compatible licenses and can be retrieved from <a href="https://github.com/friendica/friendica">https://github.com/friendica/friendica</a> and <a href="https://github.com/friendica/friendica-addons">https://github.com/friendica/friendica-addons</a>.</p>';
+ jappixmini_discover_addresses();
}
View
16 jappixmini/legal.php
@@ -0,0 +1,16 @@
+<?php
+//
+// Copyright 2012 "Leberwurscht" <leberwurscht@hoegners.de>
+//
+// This file is dual-licensed under the MIT license (see MIT.txt) and the AGPL license (see jappix/COPYING).
+//
+
+function jappixmini_download_source(&$a,&$b) {
+ // Jappix Mini source download link on About page
+
+ $b .= '<h1>Jappix Mini</h1>';
+ $b .= '<p>This site uses the jappixmini addon, which includes Jappix Mini by the <a href="'.$a->get_baseurl().'/addon/jappixmini/jappix/AUTHORS">Jappix authors</a> and is distributed under the terms of the <a href="'.$a->get_baseurl().'/addon/jappixmini/jappix/COPYING">GNU Affero General Public License</a>.</p>';
+ $b .= '<p>You can download the <a href="'.$a->get_baseurl().'/addon/jappixmini.tgz">source code of the addon</a>. The rest of Friendica is distributed under compatible licenses and can be retrieved from <a href="https://github.com/friendica/friendica">https://github.com/friendica/friendica</a> and <a href="https://github.com/friendica/friendica-addons">https://github.com/friendica/friendica-addons</a>.</p>';
+}
+
+?>
View
28 jappixmini/lib.js
@@ -97,7 +97,7 @@ function jappixmini_addon_decrypt_password(encrypted_password, callback) {
});
}
-function jappixmini_manage_roster(contacts, contacts_hash, autoapprove, autosubscribe) {
+function jappixmini_manage_roster_approve(contacts, autoapprove) {
// listen for subscriptions
con.registerHandler('presence',function(presence){
var type = presence.getType();
@@ -141,10 +141,9 @@ function jappixmini_manage_roster(contacts, contacts_hash, autoapprove, autosubs
console.log("Accepted "+xid+" ("+name+") for chat.");
}
});
+}
- // autosubscribe
- if (!autosubscribe) return;
-
+function jappixmini_manage_roster_autosubscribe(contacts, contacts_hash) {
var stored_hash = getPersistent("jappix-mini", "contacts-hash");
var contacts_changed = (stored_hash != contacts_hash); // stored_hash gets updated later if everything was successful
if (!contacts_changed) return;
@@ -223,7 +222,6 @@ function jappixmini_manage_roster(contacts, contacts_hash, autoapprove, autosubs
setPersistent("jappix-mini", "contacts-hash", contacts_hash);
console.log("Autosubscribe done.");
});
-
}
function jappixmini_addon_subscribe() {
@@ -251,6 +249,7 @@ function jappixmini_addon_start(server, username, proxy, bosh, encrypted, passwo
disconnectMini();
removeDB('jappix-mini', 'dom');
removePersistent("jappix-mini", "contacts-hash");
+ console.log("settings changed - disconnected");
}
setDB("jappix-mini", "settings-identifier", settings_identifier);
@@ -263,13 +262,24 @@ function jappixmini_addon_start(server, username, proxy, bosh, encrypted, passwo
// start jappix mini
MINI_NICKNAME = nickname;
LOCK_HOST = "off";
+DEVELOPER="on";
launchMini(true, false, server, username, password);
- // increase priority over other Jabber clients - does not seem to work?
- var priority = 101;
- presenceMini(null,null,priority);
+ jappixmini_manage_roster_approve(contacts, autoapprove);
+
+ onconnected = function(){
+ console.log("Connected");
+ // increase priority over other Jabber clients - does not seem to work?
+ // => priority must be sent with each presence packet in Jappix Mini
+// var priority = 101;
+// console.log("send presence");
+// presenceMini(null,null,priority,null,null,null,null,function(pr){console.log("Presence sent");console.log(pr.xml())});
+
+ if (autosubscribe) jappixmini_manage_roster_autosubscribe(contacts, contacts_hash);
+ };
- jappixmini_manage_roster(contacts, contacts_hash, autoapprove, autosubscribe)
+ if (!con.connected()) con.registerHandler('onconnect', onconnected);
+ else onconnected();
}
// decrypt password if necessary
View
245 jappixmini/user_settings.php
@@ -0,0 +1,245 @@
+<?php
+//
+// Copyright 2012 "Leberwurscht" <leberwurscht@hoegners.de>
+//
+// This file is dual-licensed under the MIT license (see MIT.txt) and the AGPL license (see jappix/COPYING).
+//
+
+function jappixmini_settings(&$a, &$s) {
+ // only if server does not provide own server
+ if (get_config("jappixmini","provided_server")) return;
+
+ // addon settings for a user
+
+ $activate = get_pconfig(local_user(),'jappixmini','activate');
+ $activate = intval($activate) ? ' checked="checked"' : '';
+
+ $username = get_pconfig(local_user(),'jappixmini','username');
+ $username = htmlentities($username);
+ $server = get_pconfig(local_user(),'jappixmini','server');
+ $server = htmlentities($server);
+ $bosh = get_pconfig(local_user(),'jappixmini','bosh');
+ $bosh = htmlentities($bosh);
+ $password = get_pconfig(local_user(),'jappixmini','password');
+ $autosubscribe = get_pconfig(local_user(),'jappixmini','autosubscribe');
+ $autosubscribe = intval($autosubscribe) ? ' checked="checked"' : '';
+ $autoapprove = get_pconfig(local_user(),'jappixmini','autoapprove');
+ $autoapprove = intval($autoapprove) ? ' checked="checked"' : '';
+ $encrypt = intval(get_pconfig(local_user(),'jappixmini','encrypt'));
+ $encrypt_checked = $encrypt ? ' checked="checked"' : '';
+ $encrypt_disabled = $encrypt ? '' : ' disabled="disabled"';
+
+ $info_text = get_config("jappixmini", "infotext");
+ $info_text = htmlentities($info_text);
+ $info_text = str_replace("\n", "<br />", $info_text);
+
+ // count contacts
+ $r = q("SELECT COUNT(1) as `cnt` FROM `pconfig` WHERE `uid`=%d AND `cat`='jappixmini' AND `k` LIKE 'id:%%'", local_user());
+ if (count($r)) $contact_cnt = $r[0]["cnt"];
+ else $contact_cnt = 0;
+
+ // count jabber addresses
+ $r = q("SELECT COUNT(1) as `cnt` FROM `pconfig` WHERE `uid`=%d AND `cat`='jappixmini' AND `k` LIKE 'id:%%' AND `v` LIKE '%%@%%'", local_user());
+ if (count($r)) $address_cnt = $r[0]["cnt"];
+ else $address_cnt = 0;
+
+ if (!$activate) {
+ // load scripts if not yet activated so that password can be saved
+ $a->page['htmlhead'] .= '<script type="text/javascript" src="' . $a->get_baseurl() . '/addon/jappixmini/jappix/php/get.php?t=js&amp;g=mini.xml"></script>'."\r\n";
+ $a->page['htmlhead'] .= '<script type="text/javascript" src="' . $a->get_baseurl() . '/addon/jappixmini/jappix/php/get.php?t=js&amp;f=presence.js~caps.js~name.js~roster.js"></script>'."\r\n";
+
+ $a->page['htmlhead'] .= '<script type="text/javascript" src="' . $a->get_baseurl() . '/addon/jappixmini/lib.js"></script>'."\r\n";
+ }
+
+ $s .= '<div class="settings-block">';
+
+ $s .= '<h3>Jappix Mini addon settings</h3>';
+ $s .= '<div>';
+
+ $s .= '<label for="jappixmini-activate">Activate addon</label>';
+ $s .= ' <input id="jappixmini-activate" type="checkbox" name="jappixmini-activate" value="1"'.$activate.' />';
+ $s .= '<br />';
+ $s .= '<label for="jappixmini-username">Jabber username</label>';
+ $s .= ' <input id="jappixmini-username" type="text" name="jappixmini-username" value="'.$username.'" />';
+ $s .= '<br />';
+ $s .= '<label for="jappixmini-server">Jabber server</label>';
+ $s .= ' <input id="jappixmini-server" type="text" name="jappixmini-server" value="'.$server.'" />';
+ $s .= '<br />';
+
+ $s .= '<label for="jappixmini-bosh">Jabber BOSH host</label>';
+ $s .= ' <input id="jappixmini-bosh" type="text" name="jappixmini-bosh" value="'.$bosh.'" />';
+ $s .= '<br />';
+
+ $s .= '<label for="jappixmini-password">Jabber password</label>';
+ $s .= ' <input type="hidden" id="jappixmini-password" name="jappixmini-encrypted-password" value="'.$password.'" />';
+ $s .= ' <input id="jappixmini-clear-password" type="password" value="" onchange="jappixmini_set_password();" />';
+ $s .= '<br />';
+ $onchange = "document.getElementById('jappixmini-friendica-password').disabled = !this.checked;jappixmini_set_password();";
+ $s .= '<label for="jappixmini-encrypt">Encrypt Jabber password with Friendica password (recommended)</label>';
+ $s .= ' <input id="jappixmini-encrypt" type="checkbox" name="jappixmini-encrypt" onchange="'.$onchange.'" value="1"'.$encrypt_checked.' />';
+ $s .= '<br />';
+ $s .= '<label for="jappixmini-friendica-password">Friendica password</label>';
+ $s .= ' <input id="jappixmini-friendica-password" name="jappixmini-friendica-password" type="password" onchange="jappixmini_set_password();" value=""'.$encrypt_disabled.' />';
+ $s .= '<br />';
+ $s .= '<label for="jappixmini-autoapprove">Approve subscription requests from Friendica contacts automatically</label>';
+ $s .= ' <input id="jappixmini-autoapprove" type="checkbox" name="jappixmini-autoapprove" value="1"'.$autoapprove.' />';
+ $s .= '<br />';
+ $s .= '<label for="jappixmini-autosubscribe">Subscribe to Friendica contacts automatically</label>';
+ $s .= ' <input id="jappixmini-autosubscribe" type="checkbox" name="jappixmini-autosubscribe" value="1"'.$autosubscribe.' />';
+ $s .= '<br />';
+ $s .= '<label for="jappixmini-purge">Purge internal list of jabber addresses of contacts</label>';
+ $s .= ' <input id="jappixmini-purge" type="checkbox" name="jappixmini-purge" value="1" />';
+ $s .= '<br />';
+ if ($info_text) $s .= '<br />Configuration help:<p style="margin-left:2em;">'.$info_text.'</p>';
+ $s .= '<br />Status:<p style="margin-left:2em;">Addon knows <a href="' . $a->get_baseurl() . '/jappixmini/address_list/">'.$address_cnt.' Jabber addresses of '.$contact_cnt.' Friendica contacts</a> (takes some time, usually 10 minutes, to update).</p>';
+ $s .= '<input type="submit" name="jappixmini-submit" value="' . t('Submit') . '" />';
+ $s .= ' <input type="button" value="Add contact" onclick="jappixmini_addon_subscribe();" />';
+// $s .= ' <input type="button" value="Debug connection" id="jappixmini-debug-button" />';
+ $s .= '</div>';
+
+ $s .= '</div>';
+
+ $a->page['htmlhead'] .= "<script type=\"text/javascript\">
+ function jappixmini_set_password() {
+ encrypt = document.getElementById('jappixmini-encrypt').checked;
+ password = document.getElementById('jappixmini-password');
+ clear_password = document.getElementById('jappixmini-clear-password');
+ if (encrypt) {
+ friendica_password = document.getElementById('jappixmini-friendica-password');
+
+ if (friendica_password) {
+ jappixmini_addon_set_client_secret(friendica_password.value);
+ jappixmini_addon_encrypt_password(clear_password.value, function(encrypted_password){
+ password.value = encrypted_password;
+ });
+ }
+ }
+ else {
+ password.value = clear_password.value;
+ }
+ }
+
+ jQuery(document).ready(function() {
+ encrypt = document.getElementById('jappixmini-encrypt').checked;
+ password = document.getElementById('jappixmini-password');
+ clear_password = document.getElementById('jappixmini-clear-password');
+ if (encrypt) {
+ jappixmini_addon_decrypt_password(password.value, function(decrypted_password){
+ clear_password.value = decrypted_password;
+ });
+ }
+ else {
+ clear_password.value = password.value;
+ }
+ });
+
+"./* jQuery(document).ready(function() {
+ jQuery('#jappixmini-debug-button').click(function(){
+ setDB('jappix-mini', 'debug-username', document.getElementById('jappixmini-username'));
+ setDB('jappix-mini', 'debug-server', document.getElementById('jappixmini-server'));
+ setDB('jappix-mini', 'debug-password', document.getElementById('jappixmini-clear-password'));
+ setDB('jappix-mini', 'debug-bosh', document.getElementById('jappixmini-bosh'));
+ window.location = '".$a->get_baseurl()."/addon/jappixmini/debug/1.php';
+ });*/"
+ });
+ </script>";
+}
+
+function jappixmini_settings_post(&$a,&$b) {
+ // save addon settings for a user
+
+ if(! local_user()) return;
+ $uid = local_user();
+
+ if($_POST['jappixmini-submit']) {
+ $encrypt = intval($b['jappixmini-encrypt']);
+ if ($encrypt) {
+ // check that Jabber password was encrypted with correct Friendica password
+ $friendica_password = trim($b['jappixmini-friendica-password']);
+ $encrypted = hash('whirlpool',$friendica_password);
+ $r = q("SELECT * FROM `user` WHERE `uid`=$uid AND `password`='%s'",
+ dbesc($encrypted)
+ );
+ if (!count($r)) {
+ info("Wrong friendica password!");
+ return;
+ }
+ }
+
+ $purge = intval($b['jappixmini-purge']);
+
+ $username = trim($b['jappixmini-username']);
+ $old_username = get_pconfig($uid,'jappixmini','username');
+ if ($username!=$old_username) $purge = 1;
+
+ $server = trim($b['jappixmini-server']);
+ $old_server = get_pconfig($uid,'jappixmini','server');
+ if ($server!=$old_server) $purge = 1;
+
+ $activate = intval($b['jappixmini-activate']);
+ $was_activated = get_pconfig($uid,'jappixmini','activate');
+ if ($was_activated && !$activate) $purge = 1;
+
+ set_pconfig($uid,'jappixmini','username',$username);
+ set_pconfig($uid,'jappixmini','server',$server);
+ set_pconfig($uid,'jappixmini','bosh',trim($b['jappixmini-bosh']));
+ set_pconfig($uid,'jappixmini','password',trim($b['jappixmini-encrypted-password']));
+ set_pconfig($uid,'jappixmini','autosubscribe',intval($b['jappixmini-autosubscribe']));
+ set_pconfig($uid,'jappixmini','autoapprove',intval($b['jappixmini-autoapprove']));
+ set_pconfig($uid,'jappixmini','activate',$activate);
+ set_pconfig($uid,'jappixmini','encrypt',$encrypt);
+ info( 'Jappix Mini settings saved.' );
+
+ if ($purge) {
+ q("DELETE FROM `pconfig` WHERE `uid`=$uid AND `cat`='jappixmini' AND `k` LIKE 'id:%%'");
+ info( 'List of addresses purged.' );
+ }
+ }
+}
+
+
+function jappixmini_address_list() {
+ $uid = local_user();
+ if(!$uid) return;
+
+ $addresses = 0;
+ $with = "";
+ $without = "";
+
+ $rows = q("SELECT * FROM `pconfig` WHERE `uid`=$uid AND `cat`='jappixmini' AND `k` LIKE 'id:%%'");
+ foreach ($rows as $row) {
+ $key = $row['k'];
+ $pos = strpos($key, ":");
+ $dfrn_id = substr($key, $pos+1);
+ $r = q("SELECT * FROM `contact` WHERE `uid`=$uid AND (`dfrn-id`='%s' OR `issued-id`='%s')",
+ dbesc($dfrn_id),
+ dbesc($dfrn_id)
+ );
+ $name = $r[0]["name"];
+ $image = $r[0]["micro"];
+ if ($r[0]["url"]) $url = $r[0]["url"];
+ else $url = $r[0]["nurl"];
+
+ $value = $row['v'];
+ $pos = strpos($value, ":");
+ $address = substr($value, $pos+1);
+ if (!$address) {
+ $address = "No address.";
+ $target = &$without;
+ }
+ else {
+ $addresses += 1;
+ $target = &$with;
+ }
+
+ $address = htmlspecialchars($address);
+ $name = htmlspecialchars($name);
+ $url = htmlspecialchars($url);
+ $image = htmlspecialchars($image);
+ $target .= "<tr><td><a href=\"$url\"><img alt=\"\" src=\"$image\">$name</a></td><td>$address</td></tr>";
+ }
+
+ return "<p>Knowing $addresses addresses.</p><table border=\"1\">".$with.$without."</table>";
+}
+
+?>
Please sign in to comment.
Something went wrong with that request. Please try again.