Page MenuHomePhabricator
Files F15438524

D21579.id.diff
No OneTemporary
Actions

D21579.id.diff
View Options

diff --git a/scripts/ssh/ssh-auth.php b/scripts/ssh/ssh-auth.php
--- a/scripts/ssh/ssh-auth.php
+++ b/scripts/ssh/ssh-auth.php
@@ -4,6 +4,11 @@
$root = dirname(dirname(dirname(__FILE__)));
require_once $root.'/scripts/init/init-script.php';
+$error_log = id(new PhutilErrorLog())
+ ->setLogName(pht('SSH Error Log'))
+ ->setLogPath(PhabricatorEnv::getEnvConfig('log.ssh-error.path'))
+ ->activateLog();
+
// TODO: For now, this is using "parseParital()", not "parse()". This allows
// the script to accept (and ignore) additional arguments. This preserves
// backward compatibility until installs have time to migrate to the new
diff --git a/scripts/ssh/ssh-exec.php b/scripts/ssh/ssh-exec.php
--- a/scripts/ssh/ssh-exec.php
+++ b/scripts/ssh/ssh-exec.php
@@ -4,7 +4,12 @@
$ssh_start_time = microtime(true);
$root = dirname(dirname(dirname(__FILE__)));
-require_once $root.'/scripts/__init_script__.php';
+require_once $root.'/scripts/init/init-script.php';
+
+$error_log = id(new PhutilErrorLog())
+ ->setLogName(pht('SSH Error Log'))
+ ->setLogPath(PhabricatorEnv::getEnvConfig('log.ssh-error.path'))
+ ->activateLog();
$ssh_log = PhabricatorSSHLog::getLog();
diff --git a/src/applications/config/option/PhabricatorAccessLogConfigOptions.php b/src/applications/config/option/PhabricatorAccessLogConfigOptions.php
--- a/src/applications/config/option/PhabricatorAccessLogConfigOptions.php
+++ b/src/applications/config/option/PhabricatorAccessLogConfigOptions.php
@@ -116,6 +116,20 @@
->setLocked(true)
->setSummary(pht('SSH log format.'))
->setDescription($ssh_desc),
+ $this->newOption('log.ssh-error.path', 'string', null)
+ ->setLocked(true)
+ ->setSummary(pht('SSH error log location.'))
+ ->setDescription(
+ pht(
+ 'To enable the Phabricator SSH error log, specify a path. Errors '.
+ 'occurring in contexts where Phabricator is serving SSH requests '.
+ 'will be written to this log.'.
+ "\n\n".
+ 'If not set, no log will be written.'))
+ ->addExample(null, pht('Disable SSH error log.'))
+ ->addExample(
+ '/var/log/phabricator/ssh-error.log',
+ pht('Write SSH error log here.')),
);
}

File Metadata

Mime Type
text/plain
Expires
Thu, Mar 27, 1:13 AM (1 w, 2 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7228502
Default Alt Text
D21579.id.diff (2 KB)

Event Timeline

Phabricator · Built by Phacility