Skip to content

An open-source, self-hostable PaaS alternative to Vercel, Heroku & Netlify that lets you easily deploy static sites, databases, full-stack applications and 360+ one-click services on your own servers.

Merge remote-tracking branch 'origin/next' into api-sensitive-data-scrubber

Andras Bacsaiff976a134f12
diff --cc app/Models/InstanceSettings.php
index d63611facd,57d3e6ae64..9337404038
--- a/app/Models/InstanceSettings.php
+++ b/app/Models/InstanceSettings.php
@@@ -46,19 -46,10 +46,21 @@@ class InstanceSettings extends Mode
'dev_helper_version',
'is_wire_navigate_enabled',
'is_mcp_server_enabled',
+ 'webhook_allowed_internal_hosts',
+ 'webhook_allow_localhost',
];
+ protected $hidden = [
+ 'smtp_from_address',
+ 'smtp_from_name',
+ 'smtp_recipients',
+ 'smtp_host',
+ 'smtp_username',
+ 'smtp_password',
+ 'resend_api_key',
+ 'sentinel_token',
+ ];
+
protected $casts = [
'smtp_enabled' => 'boolean',
'smtp_from_address' => 'encrypted',
diff --cc tests/Feature/Api/GithubAppsListApiTest.php
index 66d3d6908a,8f3e6dac5c..9a1f1f3d25
--- a/tests/Feature/Api/GithubAppsListApiTest.php
+++ b/tests/Feature/Api/GithubAppsListApiTest.php
@@@ -10,13 -11,7 +11,10 @@@ use Illuminate\Support\Facades\Http
uses(RefreshDatabase::class);
beforeEach(function () {
+ config()->set('app.maintenance.driver', 'file');
+ config()->set('cache.default', 'array');
+
- InstanceSettings::query()->delete();
- $settings = new InstanceSettings;
- $settings->id = 0;
- $settings->save();
+ InstanceSettings::forceCreate(['id' => 0, 'is_api_enabled' => true]);
// Create a team with owner
$this->team = Team::factory()->create();
@@@ -34,13 -31,26 +34,33 @@@
]);
});
+function createGithubAppsApiToken($context, array $abilities): string
+{
+ session(['currentTeam' => $context->team]);
+
+ return $context->user->createToken('github-apps-test-token', $abilities)->plainTextToken;
+}
+
+ /**
+ * Generate a temporary 2048-bit RSA private key for GitHub Apps API tests.
+ *
+ * Generated in-process so tests do not depend on external files or secrets;
+ * the key is used only as a signing fixture and is never persisted.
+ *
+ * @return string PEM-encoded RSA private key
+ */
+ function validGithubAppsApiPrivateKey(): string
+ {
+ $key = openssl_pkey_new([
+ 'private_key_bits' => 2048,
+ 'private_key_type' => OPENSSL_KEYTYPE_RSA,
+ ]);
+
+ openssl_pkey_export($key, $privateKey);
+
+ return $privateKey;
+ }
+
describe('GET /api/v1/github-apps', function () {
test('returns 401 when not authenticated', function () {
$response = $this->getJson('/api/v1/github-apps');