wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Allow 2048 and 4096 bit SFTP keys

Browse source 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
This commit is contained in:
Roeland Jago Douma 2017-06-05 15:42:25 +02:00
parent 928b6a376e
commit 25e08bc8a0
No known key found for this signature in database
GPG key ID: F941078878347C0C
3 changed files with 30 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
apps/files_external/js/public_key.js
View file

@ -22,6 +22,19 @@ $(document).ready(function() {
});
function setupTableRow(tr, config) {
var selectList = document.createElement('select');
selectList.id = 'keyLength';
var options = [1024, 2048, 4096];
for (var i = 0; i < options.length; i++) {
var option = document.createElement('option');
option.value = options[i];
option.text = options[i];
selectList.appendChild(option);
}
$(config).append(selectList);
$(config).append($(document.createElement('input'))
.addClass('button auth-param')
.attr('type', 'button')
@ -32,8 +45,11 @@ $(document).ready(function() {
function generateKeys(tr) {
var config = $(tr).find('.configuration');
var keyLength = config.find('#keyLength').val();
$.post(OC.filePath('files_external', 'ajax', 'public_key.php'), {}, function(result) {
$.post(OC.filePath('files_external', 'ajax', 'public_key.php'), {
keyLength: keyLength
}, function(result) {
if (result && result.status === 'success') {
$(config).find('[data-parameter="public_key"]').val(result.data.public_key).keyup();
$(config).find('[data-parameter="private_key"]').val(result.data.private_key);

10
apps/files_external/lib/Controller/AjaxController.php
View file

@ -68,10 +68,11 @@ class AjaxController extends Controller {
}
/**
* @param int $keyLength
* @return array
*/
private function generateSshKeys() {
$key = $this->rsaMechanism->createKey();
private function generateSshKeys($keyLength) {
$key = $this->rsaMechanism->createKey($keyLength);
// Replace the placeholder label with a more meaningful one
$key['publickey'] = str_replace('phpseclib-generated-key', gethostname(), $key['publickey']);
@ -82,9 +83,10 @@ class AjaxController extends Controller {
* Generates an SSH public/private key pair.
*
* @NoAdminRequired
* @param int $keyLength
*/
public function getSshKeys() {
$key = $this->generateSshKeys();
public function getSshKeys($keyLength = 1024) {
$key = $this->generateSshKeys($keyLength);
return new JSONResponse(
array('data' => array(
'private_key' => $key['privatekey'],

9
apps/files_external/lib/Lib/Auth/PublicKey/RSA.php
View file

@ -69,14 +69,19 @@ class RSA extends AuthMechanism {
/**
* Generate a keypair
*
* @param int $keyLenth
* @return array ['privatekey' => $privateKey, 'publickey' => $publicKey]
*/
public function createKey() {
public function createKey($keyLength) {
$rsa = new RSACrypt();
$rsa->setPublicKeyFormat(RSACrypt::PUBLIC_FORMAT_OPENSSH);
$rsa->setPassword($this->config->getSystemValue('secret', ''));
return $rsa->createKey(self::CREATE_KEY_BITS);
if ($keyLength !== 1024 && $keyLength !== 2048 && $keyLength !== 4096) {
$keyLength = 1024;
}
return $rsa->createKey($keyLength);
}
}