X-Git-Url: http://git.vrable.net/?a=blobdiff_plain;f=bluesky%2Fbluesky-private.h;h=20079daae419028ea0777e885effcf3af106523e;hb=afc95f0ab2900a311802028f1b811867fa3c0c31;hp=dd55729fc6e12dba58381219e1f71175a854ee0c;hpb=3e5285d5e2ffe02fcbc61d2ede540edca173595f;p=bluesky.git diff --git a/bluesky/bluesky-private.h b/bluesky/bluesky-private.h index dd55729..20079da 100644 --- a/bluesky/bluesky-private.h +++ b/bluesky/bluesky-private.h @@ -58,6 +58,32 @@ void bluesky_serialize_cloudlog(BlueSkyCloudLog *log, GString *authenticated, GString *writable); +/* Cryptographic operations. */ +#define CRYPTO_BLOCK_SIZE 16 /* 128-bit AES */ +#define CRYPTO_KEY_SIZE 16 +#define CRYPTO_HASH_SIZE 32 /* SHA-256 */ + +typedef struct BlueSkyCryptKeys { + uint8_t encryption_key[CRYPTO_KEY_SIZE]; + uint8_t authentication_key[CRYPTO_HASH_SIZE]; +} BlueSkyCryptKeys; + +void bluesky_crypt_init(); +void bluesky_crypt_hash_key(const char *keystr, uint8_t *out); +void bluesky_crypt_random_bytes(guchar *buf, gint len); +void bluesky_crypt_derive_keys(BlueSkyCryptKeys *keys, const gchar *master); +BlueSkyRCStr *bluesky_crypt_encrypt(BlueSkyRCStr *in, const uint8_t *key); +BlueSkyRCStr *bluesky_crypt_decrypt(BlueSkyRCStr *in, const uint8_t *key); + +void bluesky_crypt_block_encrypt(gchar *cloud_block, size_t len, + BlueSkyCryptKeys *keys); +gboolean bluesky_crypt_block_decrypt(gchar *cloud_block, size_t len, + BlueSkyCryptKeys *keys); +void bluesky_cloudlog_encrypt(GString *segment, BlueSkyCryptKeys *keys); +void bluesky_cloudlog_decrypt(char *segment, size_t len, + BlueSkyCryptKeys *keys, + BlueSkyRangeset *items); + /* Storage layer. Requests can be performed asynchronously, so these objects * help keep track of operations in progress. */ typedef enum { @@ -76,8 +102,8 @@ typedef enum { } BlueSkyAsyncStatus; struct BlueSkyNotifierList; -typedef struct _BlueSkyStoreAsync BlueSkyStoreAsync; -struct _BlueSkyStoreAsync { +typedef struct BlueSkyStoreAsync BlueSkyStoreAsync; +struct BlueSkyStoreAsync { BlueSkyStore *store; GMutex *lock; @@ -91,6 +117,14 @@ struct _BlueSkyStoreAsync { gchar *key; /* Key to read/write */ BlueSkyRCStr *data; /* Data read/to write */ + /* For range requests on reads: starting byte offset and length; len 0 + * implies reading to the end of the object. At completion, the backend + * should set range_done if a range read was made; if not set the entire + * object was read and the storage layer will select out just the + * appropriate bytes. */ + size_t start, len; + gboolean range_done; + int result; /* Result code; 0 for success. */ struct BlueSkyNotifierList *notifiers; gint notifier_count; @@ -104,6 +138,10 @@ struct _BlueSkyStoreAsync { bluesky_time_hires exec_time; /* Time processing started on operation. */ gpointer store_private; /* For use by the storage implementation */ + + /* If storage operations should be charged to any particular profile, which + * one? */ + BlueSkyProfile *profile; }; /* Support for notification lists. These are lists of one-shot functions which @@ -169,6 +207,12 @@ void bluesky_file_drop_cached(BlueSkyInode *inode); * various pieces of data (both where in the cloud and where cached locally). * */ +/* Eventually we'll want to support multiple writers. But for now, hard-code + * separate namespaces in the cloud for the proxy and the cleaner to write to. + * */ +#define BLUESKY_CLOUD_DIR_PRIMARY 0 +#define BLUESKY_CLOUD_DIR_CLEANER 1 + typedef struct { char bytes[16]; } BlueSkyCloudID; @@ -223,6 +267,7 @@ struct cloudlog_header { #define JOURNAL_MAGIC "\nLog" #define CLOUDLOG_MAGIC "AgI-" +#define CLOUDLOG_MAGIC_ENCRYPTED "AgI=" // CLOUDLOG_MAGIC[3] ^= 0x10 /* A record which tracks an object which has been written to a local log, * cached, locally, and/or written to the cloud. */ @@ -230,7 +275,7 @@ struct cloudlog_header { #define CLOUDLOG_CLOUD 0x02 #define CLOUDLOG_CACHE 0x04 #define CLOUDLOG_UNCOMMITTED 0x10 -struct _BlueSkyCloudLog { +struct BlueSkyCloudLog { gint refcount; GMutex *lock; GCond *cond; @@ -274,12 +319,18 @@ struct _BlueSkyCloudLog { }; /* Serialize objects into a log segment to be written to the cloud. */ -struct _BlueSkyCloudLogState { +struct BlueSkyCloudLogState { GString *data; BlueSkyCloudPointer location; GList *inode_list; GSList *writeback_list; // Items which are being serialized right now GList *pending_segments; // Segments which are being uploaded now + + /* What is the most recent sequence number written by the cleaner which we + * have processed and incorporated into our own log? This gets + * incorporated into the version vector written out with our checkpoint + * records. */ + int latest_cleaner_seq_seen; }; gboolean bluesky_cloudlog_equal(gconstpointer a, gconstpointer b); @@ -297,6 +348,7 @@ void bluesky_cloudlog_sync(BlueSkyCloudLog *log); void bluesky_cloudlog_insert(BlueSkyCloudLog *log); void bluesky_cloudlog_insert_locked(BlueSkyCloudLog *log); BlueSkyCloudLog *bluesky_cloudlog_get(BlueSkyFS *fs, BlueSkyCloudID id); +void bluesky_cloudlog_prefetch(BlueSkyCloudLog *log); void bluesky_cloudlog_fetch(BlueSkyCloudLog *log); BlueSkyCloudPointer bluesky_cloudlog_serialize(BlueSkyCloudLog *log, BlueSkyFS *fs); @@ -309,7 +361,7 @@ void bluesky_cloudlog_flush(BlueSkyFS *fs); uint32_t crc32c(uint32_t crc, const char *buf, unsigned int length); uint32_t crc32c_finalize(uint32_t crc); -struct _BlueSkyLog { +struct BlueSkyLog { BlueSkyFS *fs; char *log_directory; GAsyncQueue *queue; @@ -336,7 +388,7 @@ struct _BlueSkyLog { /* An object for tracking log files which are stored locally--either the * journal for filesystem consistency or log segments which have been fetched * back from cloud storage. */ -struct _BlueSkyCacheFile { +struct BlueSkyCacheFile { GMutex *lock; GCond *cond; gint refcount; @@ -347,10 +399,13 @@ struct _BlueSkyCacheFile { gint mapcount; // References to the mmaped data const char *addr; // May be null if data is not mapped in memory size_t len; + int disk_used; BlueSkyFS *fs; BlueSkyLog *log; gboolean fetching, ready; // Cloud data: downloading or ready for use int64_t atime; // Access time, for cache management + BlueSkyRangeset *items; // Locations of valid items + BlueSkyRangeset *prefetches;// Locations we have been requested to prefetch }; BlueSkyLog *bluesky_log_new(const char *log_directory); @@ -359,13 +414,13 @@ void bluesky_log_finish_all(GList *log_items); BlueSkyCloudLog *bluesky_log_get_commit_point(BlueSkyFS *fs); void bluesky_log_write_commit_point(BlueSkyFS *fs, BlueSkyCloudLog *marker); -BlueSkyRCStr *bluesky_log_map_object(BlueSkyFS *fs, int log_dir, int log_seq, - int log_offset, int log_size); +BlueSkyRCStr *bluesky_log_map_object(BlueSkyCloudLog *item, gboolean map_data); void bluesky_mmap_unref(BlueSkyCacheFile *mmap); void bluesky_cachefile_unref(BlueSkyCacheFile *cachefile); BlueSkyCacheFile *bluesky_cachefile_lookup(BlueSkyFS *fs, - int clouddir, int log_seq); + int clouddir, int log_seq, + gboolean start_fetch); void bluesky_cachefile_gc(BlueSkyFS *fs); void bluesky_replay(BlueSkyFS *fs);