Page MenuHomePhabricator
Files F14010461

D11452.diff
No OneTemporary
Actions

D11452.diff
View Options

diff --git a/.gitignore b/.gitignore
--- a/.gitignore
+++ b/.gitignore
@@ -15,6 +15,7 @@
/conf/local/VERSION
/conf/keys/device.pub
/conf/keys/device.key
+/conf/keys/device.id
# Impact Font
/resources/font/impact.ttf
diff --git a/src/applications/almanac/management/AlmanacManagementRegisterWorkflow.php b/src/applications/almanac/management/AlmanacManagementRegisterWorkflow.php
--- a/src/applications/almanac/management/AlmanacManagementRegisterWorkflow.php
+++ b/src/applications/almanac/management/AlmanacManagementRegisterWorkflow.php
@@ -23,7 +23,15 @@
'name' => 'allow-key-reuse',
'help' => pht(
'Register even if another host is already registered with this '.
- 'keypair.'),
+ 'keypair. This is an advanced featuer which allows a pool of '.
+ 'devices to share credentials.'),
+ ),
+ array(
+ 'name' => 'identify-as',
+ 'param' => 'name',
+ 'help' => pht(
+ 'Specify an alternate host identity. This is an advanced '.
+ 'feature which allows a pool of devices to share credentials.'),
),
array(
'name' => 'force',
@@ -85,6 +93,7 @@
$stored_public_path = AlmanacKeys::getKeyPath('device.pub');
$stored_private_path = AlmanacKeys::getKeyPath('device.key');
+ $stored_device_path = AlmanacKeys::getKeyPath('device.id');
if (!$args->getArg('force')) {
if (Filesystem::pathExists($stored_public_path)) {
@@ -171,6 +180,24 @@
Filesystem::writeFile($tmp_private, $raw_private_key);
execx('mv -f %s %s', $tmp_private, $stored_private_path);
+ $raw_device = $device_name;
+ $identify_as = $args->getArg('identify-as');
+ if (strlen($identify_as)) {
+ $raw_device = $identify_as;
+ }
+
+ $console->writeOut(
+ "%s\n",
+ pht('Installing device ID...', $raw_device));
+
+ // The permissions on this file are more open because the webserver also
+ // needs to read it.
+ $tmp_device = new TempFile();
+ Filesystem::changePermissions($tmp_device, 0644);
+ execx('chown %s %s', $phd_user, $tmp_device);
+ Filesystem::writeFile($tmp_device, $raw_device);
+ execx('mv -f %s %s', $tmp_device, $stored_device_path);
+
if (!$public_key->getID()) {
$console->writeOut(
"%s\n",
@@ -184,7 +211,7 @@
pht(
'This host has been registered as "%s" and a trusted keypair '.
'has been installed.',
- $device_name));
+ $raw_device));
}
}
diff --git a/src/applications/almanac/util/AlmanacKeys.php b/src/applications/almanac/util/AlmanacKeys.php
--- a/src/applications/almanac/util/AlmanacKeys.php
+++ b/src/applications/almanac/util/AlmanacKeys.php
@@ -9,4 +9,14 @@
return $keys.ltrim($key_name, '/');
}
+ public static function getDeviceID() {
+ $device_id_path = self::getKeyPath('device.id');
+
+ if (Filesystem::pathExists($device_id_path)) {
+ return trim(Filesystem::readFile($device_id_path));
+ }
+
+ return null;
+ }
+
}

File Metadata

Mime Type
text/plain
Expires
Fri, Nov 1, 8:50 AM (1 w, 4 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6756000
Default Alt Text
D11452.diff (3 KB)

Event Timeline

Phabricator · Built by Phacility