forked from cory/tildefriends
		
	Support deleting identities, too.
git-svn-id: https://www.unprompted.com/svn/projects/tildefriends/trunk@4736 ed5197a5-7fde-0310-b194-c3ffbd925b24
This commit is contained in:
		| @@ -1,5 +1,5 @@ | |||||||
| { | { | ||||||
|   "type": "tildefriends-app", |   "type": "tildefriends-app", | ||||||
|   "emoji": "🪪", |   "emoji": "🪪", | ||||||
|   "previous": "&BOmGofChv5mvgZq61xy5mSS0fshtttcG68uL1ILu+qo=.sha256" |   "previous": "&kgukkyDk1RxgfzgMH6H/0QeDPIuwPZypLuAFax21ljk=.sha256" | ||||||
| } | } | ||||||
| @@ -3,48 +3,85 @@ import * as tfrpc from '/tfrpc.js'; | |||||||
| tfrpc.register(async function get_private_key(id) { | tfrpc.register(async function get_private_key(id) { | ||||||
| 	return bip39Words(await ssb.getPrivateKey(id)); | 	return bip39Words(await ssb.getPrivateKey(id)); | ||||||
| }); | }); | ||||||
|  | tfrpc.register(async function create_id(id) { | ||||||
|  | 	return await ssb.createIdentity(); | ||||||
|  | }); | ||||||
| tfrpc.register(async function add_id(id) { | tfrpc.register(async function add_id(id) { | ||||||
| 	return await ssb.addIdentity(bip39Bytes(id)); | 	return await ssb.addIdentity(bip39Bytes(id)); | ||||||
| }); | }); | ||||||
|  | tfrpc.register(async function delete_id(id) { | ||||||
|  | 	return await ssb.deleteIdentity(id); | ||||||
|  | }); | ||||||
|  | tfrpc.register(async function reload() { | ||||||
|  | 	await main(); | ||||||
|  | }); | ||||||
|  |  | ||||||
| async function main() { | async function main() { | ||||||
| 	let ids = await ssb.getIdentities(); | 	let ids = await ssb.getIdentities(); | ||||||
| 	await app.setDocument(`<body style="color: #fff"> | 	await app.setDocument(`<body style="color: #fff"> | ||||||
|  | 		<script>const handler = {};</script> | ||||||
| 		<script type="module"> | 		<script type="module"> | ||||||
| 			import * as tfrpc from '/static/tfrpc.js'; | 			import * as tfrpc from '/static/tfrpc.js'; | ||||||
| 			async function export_id(event) { | 			handler.export_id = async function export_id(event) { | ||||||
| 				let id = event.srcElement.innerHTML; | 				let id = event.srcElement.dataset.id; | ||||||
| 				let element = document.createElement('textarea'); | 				let element = document.createElement('textarea'); | ||||||
| 				element.value = await tfrpc.rpc.get_private_key(id); | 				element.value = await tfrpc.rpc.get_private_key(id); | ||||||
| 				element.style = 'width: 100%; read-only: true'; | 				element.style = 'width: 100%; read-only: true'; | ||||||
| 				element.readOnly = true; | 				element.readOnly = true; | ||||||
| 				document.body.insertBefore(element, event.srcElement.parentNode.nextSibling); | 				event.srcElement.parentElement.appendChild(element); | ||||||
| 				event.srcElement.onclick = event => hide_id(event, element); | 				event.srcElement.onclick = event => handler.hide_id(event, element); | ||||||
| 			} | 			} | ||||||
| 			async function add_id(event) { | 			handler.add_id = async function add_id(event) { | ||||||
| 				let id = document.getElementById('add_id').value; | 				let id = document.getElementById('add_id').value; | ||||||
| 				await tfrpc.rpc.add_id(id); | 				try { | ||||||
|  | 					let new_id = await tfrpc.rpc.add_id(id); | ||||||
|  | 					alert('Successfully imported: ' + new_id); | ||||||
|  | 					await tfrpc.rpc.reload(); | ||||||
|  | 				} catch (e) { | ||||||
|  | 					alert('Error importing identity: ' + e); | ||||||
| 				} | 				} | ||||||
| 			function hide_id(event, element) { | 			} | ||||||
|  | 			handler.create_id = async function create_id(event) { | ||||||
|  | 				try { | ||||||
|  | 					let id = await tfrpc.rpc.create_id(); | ||||||
|  | 					alert('Successfully created: ' + id); | ||||||
|  | 					await tfrpc.rpc.reload(); | ||||||
|  | 				} catch (e) { | ||||||
|  | 					alert('Error creating identity: ' + e); | ||||||
|  | 				} | ||||||
|  | 			} | ||||||
|  | 			handler.hide_id = function hide_id(event, element) { | ||||||
| 				element.parentNode.removeChild(element); | 				element.parentNode.removeChild(element); | ||||||
| 				event.srcElement.onclick = export_id; | 				event.srcElement.onclick = handler.export_id; | ||||||
| 			} | 			} | ||||||
| 			window.addEventListener('load', function() { | 			handler.delete_id = async function delete_id(event) { | ||||||
| 				for (let button of document.getElementsByTagName('button')) { | 				let id = event.srcElement.dataset.id; | ||||||
| 					if (button.id == "add") { | 				try { | ||||||
| 						button.onclick = add_id; | 					if (prompt('Are you sure you want to delete "' + id + '"?  It cannot be recovered without the exported phrase.\\n\\nEnter the word "DELETE" to confirm you wish to delete it.') === 'DELETE') { | ||||||
| 					} else { | 						if (await tfrpc.rpc.delete_id(id)) { | ||||||
| 						button.onclick = export_id; | 							alert('Successfully deleted ID: ' + id); | ||||||
|  | 						} | ||||||
|  | 						await tfrpc.rpc.reload(); | ||||||
|  | 					} | ||||||
|  | 				} catch (e) { | ||||||
|  | 					alert('Error deleting ID: ' + e); | ||||||
| 				} | 				} | ||||||
| 			} | 			} | ||||||
| 			}); |  | ||||||
| 		</script> | 		</script> | ||||||
| 		<h1>SSB Identity Management</h1> | 		<h1>SSB Identity Management</h1> | ||||||
|  | 		<h2>Create a new identity</h2> | ||||||
|  | 		<button onclick="handler.create_id()">Create Identity</button> | ||||||
| 		<h2>Import an SSB Identity from 12 BIP39 English Words</h2> | 		<h2>Import an SSB Identity from 12 BIP39 English Words</h2> | ||||||
| 		<textarea id="add_id" style="width: 100%" rows="4"></textarea><button id="add">Add ID</button> | 		<textarea id="add_id" style="width: 100%" rows="4"></textarea><button id="add" onclick="handler.add_id(event)">Import Identity</button> | ||||||
| 		<h2>Export Identities</h2>`+ | 		<h2>Identities</h2> | ||||||
| 		ids.map(id => `<div><button>${id}</button></div>`).join('\n')+ | 		<ul>`+ | ||||||
| 	`</body>`); | 		ids.map(id => `<li> | ||||||
|  | 			<button onclick="handler.export_id(event)" data-id="${id}">Export Identity</button> | ||||||
|  | 			<button onclick="handler.delete_id(event)" data-id="${id}">Delete Identity</button> | ||||||
|  | 			${id} | ||||||
|  | 		</li>`).join('\n')+ | ||||||
|  | 	`	</ul> | ||||||
|  | 	</body>`); | ||||||
| } | } | ||||||
|  |  | ||||||
| main(); | main(); | ||||||
| @@ -404,6 +404,15 @@ async function getProcessBlob(blobId, key, options) { | |||||||
| 					}); | 					}); | ||||||
| 				} | 				} | ||||||
| 			}; | 			}; | ||||||
|  | 			imports.ssb.deleteIdentity = function(id) { | ||||||
|  | 				if (process.credentials && | ||||||
|  | 					process.credentials.session && | ||||||
|  | 					process.credentials.session.name) { | ||||||
|  | 					return Promise.resolve(imports.core.permissionTest('ssb_id_delete')).then(function() { | ||||||
|  | 						return ssb.deleteIdentity(process.credentials.session.name, id); | ||||||
|  | 					}); | ||||||
|  | 				} | ||||||
|  | 			}; | ||||||
| 			imports.ssb.getOwnerIdentities = function() { | 			imports.ssb.getOwnerIdentities = function() { | ||||||
| 				if (options.packageOwner) { | 				if (options.packageOwner) { | ||||||
| 					return ssb.getIdentities(options.packageOwner); | 					return ssb.getIdentities(options.packageOwner); | ||||||
|   | |||||||
							
								
								
									
										25
									
								
								src/ssb.db.c
									
									
									
									
									
								
							
							
						
						
									
										25
									
								
								src/ssb.db.c
									
									
									
									
									
								
							| @@ -1222,6 +1222,31 @@ bool tf_ssb_db_identity_add(tf_ssb_t* ssb, const char* user, const char* public_ | |||||||
| 	return added; | 	return added; | ||||||
| } | } | ||||||
|  |  | ||||||
|  | bool tf_ssb_db_identity_delete(tf_ssb_t* ssb, const char* user, const char* public_key) | ||||||
|  | { | ||||||
|  | 	bool removed = false; | ||||||
|  | 	sqlite3* db = tf_ssb_acquire_db_writer(ssb); | ||||||
|  | 	sqlite3_stmt* statement = NULL; | ||||||
|  | 	tf_printf("deleting [%s] [%s]\n", user, public_key); | ||||||
|  | 	if (sqlite3_prepare(db, "DELETE FROM identities WHERE user = ? AND public_key = ?", -1, &statement, NULL) == SQLITE_OK) | ||||||
|  | 	{ | ||||||
|  | 		if (sqlite3_bind_text(statement, 1, user, -1, NULL) == SQLITE_OK && | ||||||
|  | 			sqlite3_bind_text(statement, 2, public_key, -1, NULL) == SQLITE_OK) | ||||||
|  | 		{ | ||||||
|  | 			removed = | ||||||
|  | 				sqlite3_step(statement) == SQLITE_DONE && | ||||||
|  | 				sqlite3_changes(db) != 0; | ||||||
|  | 			if (!removed) | ||||||
|  | 			{ | ||||||
|  | 				tf_printf("Unable to delete identity: %s.\n", sqlite3_errmsg(db)); | ||||||
|  | 			} | ||||||
|  | 		} | ||||||
|  | 		sqlite3_finalize(statement); | ||||||
|  | 	} | ||||||
|  | 	tf_ssb_release_db_writer(ssb, db); | ||||||
|  | 	return removed; | ||||||
|  | } | ||||||
|  |  | ||||||
| void tf_ssb_db_identity_visit(tf_ssb_t* ssb, const char* user, void (*callback)(const char* identity, void* user_data), void* user_data) | void tf_ssb_db_identity_visit(tf_ssb_t* ssb, const char* user, void (*callback)(const char* identity, void* user_data), void* user_data) | ||||||
| { | { | ||||||
| 	sqlite3* db = tf_ssb_acquire_db_reader(ssb); | 	sqlite3* db = tf_ssb_acquire_db_reader(ssb); | ||||||
|   | |||||||
| @@ -31,6 +31,7 @@ bool tf_ssb_db_check(sqlite3* db, const char* author); | |||||||
|  |  | ||||||
| int tf_ssb_db_identity_get_count_for_user(tf_ssb_t* ssb, const char* user); | int tf_ssb_db_identity_get_count_for_user(tf_ssb_t* ssb, const char* user); | ||||||
| bool tf_ssb_db_identity_create(tf_ssb_t* ssb, const char* user, uint8_t* out_public_key, uint8_t* out_private_key); | bool tf_ssb_db_identity_create(tf_ssb_t* ssb, const char* user, uint8_t* out_public_key, uint8_t* out_private_key); | ||||||
|  | bool tf_ssb_db_identity_delete(tf_ssb_t* ssb, const char* user, const char* public_key); | ||||||
| bool tf_ssb_db_identity_add(tf_ssb_t* ssb, const char* user, const char* public_key, const char* private_key); | bool tf_ssb_db_identity_add(tf_ssb_t* ssb, const char* user, const char* public_key, const char* private_key); | ||||||
| void tf_ssb_db_identity_visit(tf_ssb_t* ssb, const char* user, void (*callback)(const char* identity, void* user_data), void* user_data); | void tf_ssb_db_identity_visit(tf_ssb_t* ssb, const char* user, void (*callback)(const char* identity, void* user_data), void* user_data); | ||||||
| void tf_ssb_db_identity_visit_all(tf_ssb_t* ssb, void (*callback)(const char* identity, void* user_data), void* user_data); | void tf_ssb_db_identity_visit_all(tf_ssb_t* ssb, void (*callback)(const char* identity, void* user_data), void* user_data); | ||||||
|   | |||||||
							
								
								
									
										22
									
								
								src/ssb.js.c
									
									
									
									
									
								
							
							
						
						
									
										22
									
								
								src/ssb.js.c
									
									
									
									
									
								
							| @@ -139,6 +139,27 @@ static JSValue _tf_ssb_addIdentity(JSContext* context, JSValueConst this_val, in | |||||||
| 	return result; | 	return result; | ||||||
| } | } | ||||||
|  |  | ||||||
|  | static JSValue _tf_ssb_deleteIdentity(JSContext* context, JSValueConst this_val, int argc, JSValueConst* argv) | ||||||
|  | { | ||||||
|  | 	tf_ssb_t* ssb = JS_GetOpaque(this_val, _tf_ssb_classId); | ||||||
|  | 	JSValue result = JS_UNDEFINED; | ||||||
|  | 	if (ssb) | ||||||
|  | 	{ | ||||||
|  | 		const char* user = JS_ToCString(context, argv[0]); | ||||||
|  | 		const char* id = JS_ToCString(context, argv[1]); | ||||||
|  | 		if (id && user) | ||||||
|  | 		{ | ||||||
|  | 			if (tf_ssb_db_identity_delete(ssb, user, *id == '@' ? id + 1 : id)) | ||||||
|  | 			{ | ||||||
|  | 				result = JS_TRUE; | ||||||
|  | 			} | ||||||
|  | 		} | ||||||
|  | 		JS_FreeCString(context, id); | ||||||
|  | 		JS_FreeCString(context, user); | ||||||
|  | 	} | ||||||
|  | 	return result; | ||||||
|  | } | ||||||
|  |  | ||||||
| static JSValue _set_server_following_internal(tf_ssb_t* ssb, JSValueConst this_val, JSValue id, JSValue following) | static JSValue _set_server_following_internal(tf_ssb_t* ssb, JSValueConst this_val, JSValue id, JSValue following) | ||||||
| { | { | ||||||
| 	JSContext* context = tf_ssb_get_context(ssb); | 	JSContext* context = tf_ssb_get_context(ssb); | ||||||
| @@ -1720,6 +1741,7 @@ void tf_ssb_register(JSContext* context, tf_ssb_t* ssb) | |||||||
| 	/* Requires an identity. */ | 	/* Requires an identity. */ | ||||||
| 	JS_SetPropertyStr(context, object, "createIdentity", JS_NewCFunction(context, _tf_ssb_createIdentity, "createIdentity", 1)); | 	JS_SetPropertyStr(context, object, "createIdentity", JS_NewCFunction(context, _tf_ssb_createIdentity, "createIdentity", 1)); | ||||||
| 	JS_SetPropertyStr(context, object, "addIdentity", JS_NewCFunction(context, _tf_ssb_addIdentity, "addIdentity", 2)); | 	JS_SetPropertyStr(context, object, "addIdentity", JS_NewCFunction(context, _tf_ssb_addIdentity, "addIdentity", 2)); | ||||||
|  | 	JS_SetPropertyStr(context, object, "deleteIdentity", JS_NewCFunction(context, _tf_ssb_deleteIdentity, "deleteIdentity", 2)); | ||||||
| 	JS_SetPropertyStr(context, object, "setServerFollowingMe", JS_NewCFunction(context, _tf_ssb_set_server_following_me, "setServerFollowingMe", 3)); | 	JS_SetPropertyStr(context, object, "setServerFollowingMe", JS_NewCFunction(context, _tf_ssb_set_server_following_me, "setServerFollowingMe", 3)); | ||||||
| 	JS_SetPropertyStr(context, object, "getIdentities", JS_NewCFunction(context, _tf_ssb_getIdentities, "getIdentities", 1)); | 	JS_SetPropertyStr(context, object, "getIdentities", JS_NewCFunction(context, _tf_ssb_getIdentities, "getIdentities", 1)); | ||||||
| 	JS_SetPropertyStr(context, object, "getPrivateKey", JS_NewCFunction(context, _tf_ssb_getPrivateKey, "getPrivateKey", 2)); | 	JS_SetPropertyStr(context, object, "getPrivateKey", JS_NewCFunction(context, _tf_ssb_getPrivateKey, "getPrivateKey", 2)); | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user