@oneuptime/common 12.0.3 → 12.0.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/Models/DatabaseModels/AIRun.ts +38 -1
- package/Models/DatabaseModels/AlertFeed.ts +30 -0
- package/Models/DatabaseModels/CephCluster.ts +14 -0
- package/Models/DatabaseModels/CodeRepository.ts +14 -6
- package/Models/DatabaseModels/Dashboard.ts +28 -0
- package/Models/DatabaseModels/DockerHost.ts +14 -0
- package/Models/DatabaseModels/GlobalOidcProject.ts +18 -0
- package/Models/DatabaseModels/GlobalSsoProject.ts +18 -0
- package/Models/DatabaseModels/Incident.ts +2 -0
- package/Models/DatabaseModels/IncidentEpisode.ts +1 -0
- package/Models/DatabaseModels/IncidentEpisodePublicNote.ts +1 -0
- package/Models/DatabaseModels/IncidentEpisodeStateTimeline.ts +1 -0
- package/Models/DatabaseModels/IncidentFeed.ts +30 -0
- package/Models/DatabaseModels/IncidentPublicNote.ts +1 -0
- package/Models/DatabaseModels/IncidentStateTimeline.ts +1 -0
- package/Models/DatabaseModels/IoTFleet.ts +14 -0
- package/Models/DatabaseModels/KubernetesCluster.ts +14 -0
- package/Models/DatabaseModels/LogSavedView.ts +33 -0
- package/Models/DatabaseModels/NetworkDevice.ts +14 -0
- package/Models/DatabaseModels/NetworkInterface.ts +18 -0
- package/Models/DatabaseModels/Project.ts +247 -11
- package/Models/DatabaseModels/ProxmoxCluster.ts +14 -0
- package/Models/DatabaseModels/ScheduledMaintenance.ts +1 -0
- package/Models/DatabaseModels/ScheduledMaintenancePublicNote.ts +1 -0
- package/Models/DatabaseModels/ScheduledMaintenanceStateTimeline.ts +1 -0
- package/Models/DatabaseModels/ScheduledMaintenanceTemplateOwnerUser.ts +4 -4
- package/Models/DatabaseModels/Service.ts +30 -0
- package/Models/DatabaseModels/StatusPage.ts +28 -0
- package/Models/DatabaseModels/StatusPageAnnouncement.ts +1 -0
- package/Models/DatabaseModels/StatusPagePrivateUser.ts +30 -0
- package/Models/DatabaseModels/User.ts +30 -0
- package/Server/API/AIAgentDataAPI.ts +75 -55
- package/Server/API/AIInvestigationAPI.ts +175 -17
- package/Server/API/DashboardAPI.ts +429 -22
- package/Server/API/GitHubAPI.ts +119 -283
- package/Server/API/StatusPageAPI.ts +38 -19
- package/Server/API/UserAPI.ts +263 -1
- package/Server/EnvironmentConfig.ts +23 -3
- package/Server/Infrastructure/ClickhouseConfig.ts +15 -1
- package/Server/Infrastructure/ClickhouseDatabase.ts +1 -1
- package/Server/Infrastructure/GlobalCache.ts +37 -0
- package/Server/Infrastructure/Postgres/SchemaMigrations/1786018109307-AddPerUserPasswordSalt.ts +21 -0
- package/Server/Infrastructure/Postgres/SchemaMigrations/1786023262402-WidenHashedStringColumnsForScrypt.ts +68 -0
- package/Server/Infrastructure/Postgres/SchemaMigrations/1786096660558-AddTimeRangeToLogSavedView.ts +27 -0
- package/Server/Infrastructure/Postgres/SchemaMigrations/1786100000000-RestoreServiceLowerNameIndex.ts +100 -0
- package/Server/Infrastructure/Postgres/SchemaMigrations/1786101798351-MigrationName.ts +89 -0
- package/Server/Infrastructure/Postgres/SchemaMigrations/1786105470826-MigrationName.ts +27 -0
- package/Server/Infrastructure/Postgres/SchemaMigrations/1786200000000-RestoreDroppedUniqueIndexes.ts +214 -0
- package/Server/Infrastructure/Postgres/SchemaMigrations/1786300000000-QuarantineUnboundGitHubInstallations.ts +69 -0
- package/Server/Infrastructure/Postgres/SchemaMigrations/1786400000000-AddMasterPasswordSalt.ts +40 -0
- package/Server/Infrastructure/Postgres/SchemaMigrations/1786500000000-AddInvestigationCodeFixRecommendation.ts +26 -0
- package/Server/Infrastructure/Postgres/SchemaMigrations/Index.ts +20 -0
- package/Server/Services/AIRunService.ts +78 -10
- package/Server/Services/AIService.ts +94 -22
- package/Server/Services/AlertFeedService.ts +5 -0
- package/Server/Services/AnalyticsDatabaseService.ts +101 -1
- package/Server/Services/CodeRepositoryService.ts +105 -2
- package/Server/Services/DatabaseService.ts +227 -3
- package/Server/Services/IncidentFeedService.ts +5 -0
- package/Server/Services/LlmLogService.ts +46 -2
- package/Server/Services/OpenTelemetryIngestService.ts +230 -26
- package/Server/Services/UserService.ts +184 -0
- package/Server/Utils/AI/Chat/ObservabilityAssistant.ts +6 -0
- package/Server/Utils/AI/CodeFix/CodeFixAgentCompletion.ts +4 -0
- package/Server/Utils/AI/CodeFix/CodeFixReadiness.ts +8 -5
- package/Server/Utils/AI/CodeFix/FixRunBudget.ts +90 -16
- package/Server/Utils/AI/Remediation/RemediationExecutionRunner.ts +2 -0
- package/Server/Utils/AI/Remediation/RemediationPlanRunner.ts +2 -0
- package/Server/Utils/AI/SRE/AIInvestigationEngine.ts +223 -22
- package/Server/Utils/AI/SRE/AlertInvestigationRunner.ts +25 -24
- package/Server/Utils/AI/SRE/ConfidenceSignal.ts +182 -71
- package/Server/Utils/AI/SRE/FixFromIncidentTaskTrigger.ts +252 -43
- package/Server/Utils/AI/SRE/IncidentInvestigationRunner.ts +25 -24
- package/Server/Utils/AI/SRE/InstrumentationTaskTrigger.ts +47 -13
- package/Server/Utils/AI/SRE/InvestigationGrader.ts +9 -5
- package/Server/Utils/AI/SRE/InvestigationQueue.ts +141 -24
- package/Server/Utils/AI/SRE/InvestigationSubjectLock.ts +66 -0
- package/Server/Utils/AI/SRE/PostedRootCause.ts +94 -3
- package/Server/Utils/AI/SRE/README.md +1 -1
- package/Server/Utils/AI/SRE/SubjectCodeFixRun.ts +132 -10
- package/Server/Utils/AI/Toolbox/CodeTools.ts +45 -4
- package/Server/Utils/AnalyticsDatabase/ClusterConfig.ts +24 -0
- package/Server/Utils/AnalyticsDatabase/StatementGenerator.ts +13 -0
- package/Server/Utils/CodeRepository/GitHub/GitHub.ts +157 -4
- package/Server/Utils/CodeRepository/GitHub/GitHubInstallationBinding.ts +130 -0
- package/Server/Utils/Monitor/Criteria/APIRequestCriteria.ts +29 -0
- package/Server/Utils/Monitor/Criteria/DomainMonitorCriteria.ts +56 -0
- package/Server/Utils/Monitor/MonitorMetricUtil.ts +46 -0
- package/Server/Utils/Monitor/MonitorTemplateUtil.ts +1 -0
- package/Server/Utils/PasswordHash.ts +330 -0
- package/Tests/App/Dashboard/AIInvestigationHeaderStatus.test.tsx +251 -0
- package/Tests/App/Dashboard/EventStatusPanel.test.tsx +747 -0
- package/Tests/App/Dashboard/InvestigationFeedRefresh.test.tsx +480 -0
- package/Tests/App/Dashboard/InvestigationPanel.test.tsx +1184 -0
- package/Tests/App/Dashboard/InvestigationPanelStatus.test.tsx +500 -0
- package/Tests/App/Dashboard/OverviewCustomFields.test.tsx +333 -0
- package/Tests/App/Dashboard/PortMonitorCriteriaFilter.test.ts +93 -0
- package/Tests/App/Dashboard/UserCustomFields.test.tsx +392 -0
- package/Tests/App/StatusPage/PublicStatusPageAPIErrorHandling.test.ts +117 -0
- package/Tests/App/StatusPage/StatusPageModelAPIPolymorphism.test.ts +223 -0
- package/Tests/Models/DatabaseModels/PermissionCatalogueCoverage.test.ts +243 -0
- package/Tests/Server/API/AIAgentDataFixFromIncidentContext.test.ts +266 -0
- package/Tests/Server/API/AIAgentDataRepositoryToken.test.ts +381 -0
- package/Tests/Server/API/AIInvestigationAPI.test.ts +594 -0
- package/Tests/Server/API/AIInvestigationCreateFixTask.test.ts +80 -0
- package/Tests/Server/API/DashboardMasterPasswordAPI.test.ts +172 -1
- package/Tests/Server/API/DashboardPublicAttributeValuesAPI.test.ts +943 -0
- package/Tests/Server/API/DashboardPublicMetricsAggregateAPI.test.ts +1296 -0
- package/Tests/Server/API/DashboardPublicTemplatePayloads.test.ts +598 -0
- package/Tests/Server/API/GitHubAppInstallationBindingAPI.test.ts +539 -0
- package/Tests/Server/API/Helpers.ts +6 -1
- package/Tests/Server/API/StatusPageMasterPasswordAPI.test.ts +335 -0
- package/Tests/Server/API/UserProjectsAPI.test.ts +852 -0
- package/Tests/Server/Infrastructure/GlobalCache.test.ts +128 -0
- package/Tests/Server/Infrastructure/SemaphoreMutex.test.ts +215 -0
- package/Tests/Server/Services/AIRunCodeFixClaim.test.ts +59 -5
- package/Tests/Server/Services/AIRunHumanVerdict.test.ts +127 -58
- package/Tests/Server/Services/AIServiceDailyBudget.test.ts +396 -20
- package/Tests/Server/Services/AddMasterPasswordSaltMigration.test.ts +283 -0
- package/Tests/Server/Services/AddPerUserPasswordSaltMigration.test.ts +178 -0
- package/Tests/Server/Services/AnalyticsDatabasePaginationStability.test.ts +582 -0
- package/Tests/Server/Services/AnalyticsDatabaseService.test.ts +30 -1
- package/Tests/Server/Services/CodeRepositoryInstallationBinding.test.ts +305 -0
- package/Tests/Server/Services/CodeRepositoryResolutionBinding.test.ts +147 -0
- package/Tests/Server/Services/DatabaseServicePerUserPasswordSalt.test.ts +880 -0
- package/Tests/Server/Services/DatabaseServiceUpdateColumnsWithoutHooks.test.ts +54 -0
- package/Tests/Server/Services/FeedAIRunAssociation.test.ts +125 -0
- package/Tests/Server/Services/FixFromIncidentTaskTrigger.test.ts +418 -57
- package/Tests/Server/Services/InstrumentationTaskTrigger.test.ts +173 -14
- package/Tests/Server/Services/MasterPasswordScrypt.test.ts +567 -0
- package/Tests/Server/Services/OpenTelemetryServiceResolutionCache.test.ts +568 -0
- package/Tests/Server/Services/RestoreDroppedUniqueIndexesMigration.test.ts +386 -0
- package/Tests/Server/Services/RestoreServiceLowerNameIndexMigration.test.ts +240 -0
- package/Tests/Server/Services/SeparateIncidentAlertAiSettingsMigration.test.ts +194 -0
- package/Tests/Server/Services/UserServiceFirstMasterAdminElection.test.ts +885 -0
- package/Tests/Server/Services/WidenHashedStringColumnsForScryptMigration.test.ts +220 -0
- package/Tests/Server/Utils/AI/AIAlertGating.test.ts +37 -4
- package/Tests/Server/Utils/AI/AIConfidenceSignal.test.ts +330 -29
- package/Tests/Server/Utils/AI/AIIncidentGating.test.ts +25 -0
- package/Tests/Server/Utils/AI/AIInvestigationQueue.test.ts +293 -5
- package/Tests/Server/Utils/AI/CodeFixAgentCompletion.test.ts +59 -1
- package/Tests/Server/Utils/AI/CodeTools.test.ts +47 -1
- package/Tests/Server/Utils/AI/CodeWriteTools.test.ts +10 -0
- package/Tests/Server/Utils/AI/FixFromIncidentAutoTrigger.test.ts +342 -19
- package/Tests/Server/Utils/AI/FixRunBudget.test.ts +214 -30
- package/Tests/Server/Utils/AI/Insights/InvestigationQueueInsightSubject.test.ts +2 -0
- package/Tests/Server/Utils/AI/InvestigationGrader.test.ts +65 -17
- package/Tests/Server/Utils/AI/InvestigationQueueRemediationExecution.test.ts +3 -0
- package/Tests/Server/Utils/AI/InvestigationSettlement.test.ts +313 -20
- package/Tests/Server/Utils/AI/PostedRootCause.test.ts +254 -0
- package/Tests/Server/Utils/AI/RemediationExecutionRunner.test.ts +4 -0
- package/Tests/Server/Utils/AI/RemediationPlanRunner.test.ts +2 -0
- package/Tests/Server/Utils/AI/SubjectCodeFixRunDedupe.test.ts +44 -0
- package/Tests/Server/Utils/AnalyticsDatabase/ClusterAwareSchema.test.ts +30 -0
- package/Tests/Server/Utils/AnalyticsDatabase/StatementGenerator.test.ts +120 -0
- package/Tests/Server/Utils/CodeRepository/GitHubInstallationBinding.test.ts +292 -0
- package/Tests/Server/Utils/GitHubInstallationOwnershipVerification.test.ts +340 -0
- package/Tests/Server/Utils/GitHubWebhookAndTreeCacheIsolation.test.ts +250 -0
- package/Tests/Server/Utils/Monitor/Criteria/APIRequestCriteriaPortTimings.test.ts +212 -0
- package/Tests/Server/Utils/Monitor/Criteria/DomainMonitorCriteria.test.ts +401 -0
- package/Tests/Server/Utils/Monitor/MonitorMetricUtilPortTimings.test.ts +243 -0
- package/Tests/Server/Utils/PasswordHash.test.ts +585 -0
- package/Tests/Types/Dashboard/DashboardTemplates.test.ts +111 -0
- package/Tests/Types/Database/ColumnLength.test.ts +7 -1
- package/Tests/Types/HashedStringPerUserSalt.test.ts +476 -0
- package/Tests/Types/Monitor/CephMetricCatalog.test.ts +104 -0
- package/Tests/Types/Monitor/CriteriaFilter.test.ts +4 -0
- package/Tests/Types/Monitor/DockerAlertTemplates.test.ts +293 -0
- package/Tests/Types/Monitor/DockerMetricCatalog.test.ts +109 -0
- package/Tests/Types/Monitor/DockerSwarmMetricCatalog.test.ts +118 -0
- package/Tests/Types/Monitor/HostAlertTemplates.test.ts +249 -0
- package/Tests/Types/Monitor/HostMetricCatalog.test.ts +104 -0
- package/Tests/Types/Monitor/IotAlertTemplates.test.ts +320 -0
- package/Tests/Types/Monitor/IotMetricCatalog.test.ts +104 -0
- package/Tests/Types/Monitor/KubernetesMetricCatalog.test.ts +118 -0
- package/Tests/Types/Monitor/MonitorCriteriaInstance.test.ts +42 -0
- package/Tests/Types/Monitor/MonitorStep.test.ts +38 -0
- package/Tests/Types/Monitor/MonitorStepDomainMonitor.test.ts +75 -0
- package/Tests/Types/Monitor/PodmanAlertTemplates.test.ts +271 -0
- package/Tests/Types/Monitor/PodmanMetricCatalog.test.ts +109 -0
- package/Tests/Types/Monitor/ProxmoxMetricCatalog.test.ts +107 -0
- package/Tests/Types/Monitor/SnmpMonitor/SnmpVendorTemplate.test.ts +151 -0
- package/Tests/Types/Permission.test.ts +137 -0
- package/Tests/Types/Rum/SessionReplayMaskingMode.test.ts +101 -0
- package/Tests/UI/Components/AiInvestigationSettingsCard.test.tsx +5 -5
- package/Tests/UI/Components/CardModelDetailEdit.test.tsx +3 -5
- package/Tests/UI/Components/CustomFields/CustomFieldsDetail.test.tsx +696 -0
- package/Tests/UI/Components/ErrorBoundary.test.tsx +158 -0
- package/Tests/UI/Components/FeedItemSafeMode.test.tsx +74 -0
- package/Tests/UI/Components/MoreMenu.test.tsx +756 -0
- package/Tests/UI/Components/StatusPage/ResourceGroupSection.test.tsx +62 -0
- package/Tests/UI/Monitor/PortMonitorView.test.tsx +237 -0
- package/Tests/UI/Telemetry/TelemetrySnapshotWindowAlert.test.tsx +91 -0
- package/Tests/UI/Utils/DownloadFile.test.ts +103 -0
- package/Tests/UI/Utils/ErrorSupportBundle.test.ts +582 -0
- package/Tests/UI/Utils/Project.test.ts +31 -0
- package/Tests/UI/Utils/StatusPageModelAPIInjection.test.ts +245 -0
- package/Tests/UI/Utils/UseDashboardGridDnd.test.tsx +820 -0
- package/Tests/UI/Utils/UserProjectsModelAPI.test.ts +714 -0
- package/Tests/Utils/Dashboard/DashboardViewConfig.test.ts +329 -0
- package/Tests/Utils/Dashboard/GridLayout.test.ts +951 -0
- package/Tests/Utils/Monitor/MonitorMetricType.test.ts +117 -0
- package/Tests/Utils/RecordingRuleExpression.test.ts +327 -0
- package/Tests/Utils/StatusPage/GroupNestingLayout.test.ts +186 -0
- package/Tests/Utils/StatusPage/GroupTree.test.ts +456 -0
- package/Tests/Utils/StatusPage/OverviewGroupHierarchyVisibility.test.ts +588 -0
- package/Tests/Utils/TeamMembersByProject.test.ts +655 -0
- package/Tests/Utils/Telemetry/SavedViewTimeRange.test.ts +244 -0
- package/Tests/Utils/Telemetry/TelemetryQueryTimeRange.test.ts +825 -0
- package/Types/AI/AIRunCodeFixRecommendation.ts +17 -0
- package/Types/AI/CodeFixTaskContext.ts +63 -3
- package/Types/AI/CodeFixTaskType.ts +3 -3
- package/Types/Database/ColumnLength.ts +9 -1
- package/Types/Database/TableColumn.ts +11 -0
- package/Types/Database/UnsynchronizedIndex.ts +48 -0
- package/Types/HashedString.ts +140 -4
- package/Types/Monitor/CriteriaFilter.ts +4 -0
- package/Types/Monitor/DomainMonitor/DomainLookupMethod.ts +23 -0
- package/Types/Monitor/DomainMonitor/DomainMonitorResponse.ts +7 -0
- package/Types/Monitor/MonitorCriteriaInstance.ts +24 -7
- package/Types/Monitor/MonitorMetricType.ts +8 -0
- package/Types/Monitor/MonitorStep.ts +10 -1
- package/Types/Monitor/MonitorStepDomainMonitor.ts +21 -0
- package/Types/Monitor/PortMonitor/PortMonitorTimings.ts +10 -0
- package/Types/Permission.ts +23 -175
- package/Types/Probe/ProbeMonitorResponse.ts +6 -0
- package/UI/Components/BulkUpdate/BulkUpdateForm.tsx +2 -3
- package/UI/Components/CustomFields/CustomFieldsDetail.tsx +85 -11
- package/UI/Components/ErrorBoundary.tsx +138 -11
- package/UI/Components/Feed/FeedItem.tsx +9 -2
- package/UI/Components/ModelDetail/CardModelDetail.tsx +0 -12
- package/UI/Components/ModelTable/BaseModelTable.tsx +1 -1
- package/UI/Components/MonitorTemplateVariables/TemplateVariablesCatalog.ts +12 -2
- package/UI/Components/MoreMenu/MoreMenu.tsx +285 -97
- package/UI/Components/MoreMenu/MoreMenuItem.tsx +8 -5
- package/UI/Components/Navbar/NavBar.tsx +12 -2
- package/UI/Components/Navbar/NavBarMenuModal.tsx +19 -7
- package/UI/Utils/DownloadFile.ts +16 -8
- package/UI/Utils/ErrorSupportBundle.ts +805 -0
- package/UI/Utils/ModelAPI/ModelAPI.ts +19 -8
- package/UI/Utils/ModelAPI/UserProjectsModelAPI.ts +257 -0
- package/UI/Utils/Project.ts +4 -0
- package/UI/Utils/StatusPage.ts +8 -2
- package/UI/Utils/UseDashboardGridDnd.ts +917 -0
- package/Utils/Dashboard/DashboardViewConfig.ts +80 -36
- package/Utils/Dashboard/GridLayout.ts +523 -0
- package/Utils/Metrics/RecordingRuleExpression.ts +19 -17
- package/Utils/Monitor/MonitorMetricType.ts +44 -2
- package/Utils/StatusPage/GroupNestingLayout.ts +69 -0
- package/Utils/StatusPage/GroupTree.ts +157 -66
- package/Utils/StatusPage/ResourceUptime.ts +37 -2
- package/Utils/TeamMembersByProject.ts +237 -0
- package/Utils/Telemetry/SavedViewTimeRange.ts +114 -0
- package/Utils/Telemetry/TelemetryQueryTimeRange.ts +334 -0
- package/build/dist/Models/DatabaseModels/AIRun.js +39 -1
- package/build/dist/Models/DatabaseModels/AIRun.js.map +1 -1
- package/build/dist/Models/DatabaseModels/AlertFeed.js +32 -0
- package/build/dist/Models/DatabaseModels/AlertFeed.js.map +1 -1
- package/build/dist/Models/DatabaseModels/CephCluster.js +16 -1
- package/build/dist/Models/DatabaseModels/CephCluster.js.map +1 -1
- package/build/dist/Models/DatabaseModels/CodeRepository.js +14 -6
- package/build/dist/Models/DatabaseModels/CodeRepository.js.map +1 -1
- package/build/dist/Models/DatabaseModels/Dashboard.js +29 -0
- package/build/dist/Models/DatabaseModels/Dashboard.js.map +1 -1
- package/build/dist/Models/DatabaseModels/DockerHost.js +16 -1
- package/build/dist/Models/DatabaseModels/DockerHost.js.map +1 -1
- package/build/dist/Models/DatabaseModels/GlobalOidcProject.js +16 -1
- package/build/dist/Models/DatabaseModels/GlobalOidcProject.js.map +1 -1
- package/build/dist/Models/DatabaseModels/GlobalSsoProject.js +16 -1
- package/build/dist/Models/DatabaseModels/GlobalSsoProject.js.map +1 -1
- package/build/dist/Models/DatabaseModels/Incident.js +2 -0
- package/build/dist/Models/DatabaseModels/Incident.js.map +1 -1
- package/build/dist/Models/DatabaseModels/IncidentEpisode.js +1 -0
- package/build/dist/Models/DatabaseModels/IncidentEpisode.js.map +1 -1
- package/build/dist/Models/DatabaseModels/IncidentEpisodePublicNote.js +1 -0
- package/build/dist/Models/DatabaseModels/IncidentEpisodePublicNote.js.map +1 -1
- package/build/dist/Models/DatabaseModels/IncidentEpisodeStateTimeline.js +1 -0
- package/build/dist/Models/DatabaseModels/IncidentEpisodeStateTimeline.js.map +1 -1
- package/build/dist/Models/DatabaseModels/IncidentFeed.js +32 -0
- package/build/dist/Models/DatabaseModels/IncidentFeed.js.map +1 -1
- package/build/dist/Models/DatabaseModels/IncidentPublicNote.js +1 -0
- package/build/dist/Models/DatabaseModels/IncidentPublicNote.js.map +1 -1
- package/build/dist/Models/DatabaseModels/IncidentStateTimeline.js +1 -0
- package/build/dist/Models/DatabaseModels/IncidentStateTimeline.js.map +1 -1
- package/build/dist/Models/DatabaseModels/IoTFleet.js +16 -1
- package/build/dist/Models/DatabaseModels/IoTFleet.js.map +1 -1
- package/build/dist/Models/DatabaseModels/KubernetesCluster.js +16 -1
- package/build/dist/Models/DatabaseModels/KubernetesCluster.js.map +1 -1
- package/build/dist/Models/DatabaseModels/LogSavedView.js +33 -0
- package/build/dist/Models/DatabaseModels/LogSavedView.js.map +1 -1
- package/build/dist/Models/DatabaseModels/NetworkDevice.js +16 -1
- package/build/dist/Models/DatabaseModels/NetworkDevice.js.map +1 -1
- package/build/dist/Models/DatabaseModels/NetworkInterface.js +16 -1
- package/build/dist/Models/DatabaseModels/NetworkInterface.js.map +1 -1
- package/build/dist/Models/DatabaseModels/Project.js +257 -13
- package/build/dist/Models/DatabaseModels/Project.js.map +1 -1
- package/build/dist/Models/DatabaseModels/ProxmoxCluster.js +16 -1
- package/build/dist/Models/DatabaseModels/ProxmoxCluster.js.map +1 -1
- package/build/dist/Models/DatabaseModels/ScheduledMaintenance.js +1 -0
- package/build/dist/Models/DatabaseModels/ScheduledMaintenance.js.map +1 -1
- package/build/dist/Models/DatabaseModels/ScheduledMaintenancePublicNote.js +1 -0
- package/build/dist/Models/DatabaseModels/ScheduledMaintenancePublicNote.js.map +1 -1
- package/build/dist/Models/DatabaseModels/ScheduledMaintenanceStateTimeline.js +1 -0
- package/build/dist/Models/DatabaseModels/ScheduledMaintenanceStateTimeline.js.map +1 -1
- package/build/dist/Models/DatabaseModels/ScheduledMaintenanceTemplateOwnerUser.js +4 -4
- package/build/dist/Models/DatabaseModels/Service.js +28 -1
- package/build/dist/Models/DatabaseModels/Service.js.map +1 -1
- package/build/dist/Models/DatabaseModels/StatusPage.js +29 -0
- package/build/dist/Models/DatabaseModels/StatusPage.js.map +1 -1
- package/build/dist/Models/DatabaseModels/StatusPageAnnouncement.js +1 -0
- package/build/dist/Models/DatabaseModels/StatusPageAnnouncement.js.map +1 -1
- package/build/dist/Models/DatabaseModels/StatusPagePrivateUser.js +32 -0
- package/build/dist/Models/DatabaseModels/StatusPagePrivateUser.js.map +1 -1
- package/build/dist/Models/DatabaseModels/User.js +32 -0
- package/build/dist/Models/DatabaseModels/User.js.map +1 -1
- package/build/dist/Server/API/AIAgentDataAPI.js +49 -48
- package/build/dist/Server/API/AIAgentDataAPI.js.map +1 -1
- package/build/dist/Server/API/AIInvestigationAPI.js +111 -11
- package/build/dist/Server/API/AIInvestigationAPI.js.map +1 -1
- package/build/dist/Server/API/DashboardAPI.js +312 -15
- package/build/dist/Server/API/DashboardAPI.js.map +1 -1
- package/build/dist/Server/API/GitHubAPI.js +94 -167
- package/build/dist/Server/API/GitHubAPI.js.map +1 -1
- package/build/dist/Server/API/StatusPageAPI.js +29 -11
- package/build/dist/Server/API/StatusPageAPI.js.map +1 -1
- package/build/dist/Server/API/UserAPI.js +187 -2
- package/build/dist/Server/API/UserAPI.js.map +1 -1
- package/build/dist/Server/EnvironmentConfig.js +21 -3
- package/build/dist/Server/EnvironmentConfig.js.map +1 -1
- package/build/dist/Server/Infrastructure/ClickhouseConfig.js +12 -1
- package/build/dist/Server/Infrastructure/ClickhouseConfig.js.map +1 -1
- package/build/dist/Server/Infrastructure/ClickhouseDatabase.js +1 -1
- package/build/dist/Server/Infrastructure/ClickhouseDatabase.js.map +1 -1
- package/build/dist/Server/Infrastructure/GlobalCache.js +29 -0
- package/build/dist/Server/Infrastructure/GlobalCache.js.map +1 -1
- package/build/dist/Server/Infrastructure/Postgres/SchemaMigrations/1786018109307-AddPerUserPasswordSalt.js +14 -0
- package/build/dist/Server/Infrastructure/Postgres/SchemaMigrations/1786018109307-AddPerUserPasswordSalt.js.map +1 -0
- package/build/dist/Server/Infrastructure/Postgres/SchemaMigrations/1786023262402-WidenHashedStringColumnsForScrypt.js +59 -0
- package/build/dist/Server/Infrastructure/Postgres/SchemaMigrations/1786023262402-WidenHashedStringColumnsForScrypt.js.map +1 -0
- package/build/dist/Server/Infrastructure/Postgres/SchemaMigrations/1786096660558-AddTimeRangeToLogSavedView.js +22 -0
- package/build/dist/Server/Infrastructure/Postgres/SchemaMigrations/1786096660558-AddTimeRangeToLogSavedView.js.map +1 -0
- package/build/dist/Server/Infrastructure/Postgres/SchemaMigrations/1786100000000-RestoreServiceLowerNameIndex.js +93 -0
- package/build/dist/Server/Infrastructure/Postgres/SchemaMigrations/1786100000000-RestoreServiceLowerNameIndex.js.map +1 -0
- package/build/dist/Server/Infrastructure/Postgres/SchemaMigrations/1786101798351-MigrationName.js +36 -0
- package/build/dist/Server/Infrastructure/Postgres/SchemaMigrations/1786101798351-MigrationName.js.map +1 -0
- package/build/dist/Server/Infrastructure/Postgres/SchemaMigrations/1786105470826-MigrationName.js +18 -0
- package/build/dist/Server/Infrastructure/Postgres/SchemaMigrations/1786105470826-MigrationName.js.map +1 -0
- package/build/dist/Server/Infrastructure/Postgres/SchemaMigrations/1786200000000-RestoreDroppedUniqueIndexes.js +101 -0
- package/build/dist/Server/Infrastructure/Postgres/SchemaMigrations/1786200000000-RestoreDroppedUniqueIndexes.js.map +1 -0
- package/build/dist/Server/Infrastructure/Postgres/SchemaMigrations/1786300000000-QuarantineUnboundGitHubInstallations.js +66 -0
- package/build/dist/Server/Infrastructure/Postgres/SchemaMigrations/1786300000000-QuarantineUnboundGitHubInstallations.js.map +1 -0
- package/build/dist/Server/Infrastructure/Postgres/SchemaMigrations/1786400000000-AddMasterPasswordSalt.js +19 -0
- package/build/dist/Server/Infrastructure/Postgres/SchemaMigrations/1786400000000-AddMasterPasswordSalt.js.map +1 -0
- package/build/dist/Server/Infrastructure/Postgres/SchemaMigrations/1786500000000-AddInvestigationCodeFixRecommendation.js +19 -0
- package/build/dist/Server/Infrastructure/Postgres/SchemaMigrations/1786500000000-AddInvestigationCodeFixRecommendation.js.map +1 -0
- package/build/dist/Server/Infrastructure/Postgres/SchemaMigrations/Index.js +20 -0
- package/build/dist/Server/Infrastructure/Postgres/SchemaMigrations/Index.js.map +1 -1
- package/build/dist/Server/Services/AIRunService.js +58 -12
- package/build/dist/Server/Services/AIRunService.js.map +1 -1
- package/build/dist/Server/Services/AIService.js +74 -21
- package/build/dist/Server/Services/AIService.js.map +1 -1
- package/build/dist/Server/Services/AlertFeedService.js +3 -0
- package/build/dist/Server/Services/AlertFeedService.js.map +1 -1
- package/build/dist/Server/Services/AnalyticsDatabaseService.js +86 -2
- package/build/dist/Server/Services/AnalyticsDatabaseService.js.map +1 -1
- package/build/dist/Server/Services/CodeRepositoryService.js +90 -2
- package/build/dist/Server/Services/CodeRepositoryService.js.map +1 -1
- package/build/dist/Server/Services/DatabaseService.js +180 -3
- package/build/dist/Server/Services/DatabaseService.js.map +1 -1
- package/build/dist/Server/Services/IncidentFeedService.js +3 -0
- package/build/dist/Server/Services/IncidentFeedService.js.map +1 -1
- package/build/dist/Server/Services/LlmLogService.js +22 -1
- package/build/dist/Server/Services/LlmLogService.js.map +1 -1
- package/build/dist/Server/Services/OpenTelemetryIngestService.js +155 -25
- package/build/dist/Server/Services/OpenTelemetryIngestService.js.map +1 -1
- package/build/dist/Server/Services/UserService.js +165 -0
- package/build/dist/Server/Services/UserService.js.map +1 -1
- package/build/dist/Server/Utils/AI/Chat/ObservabilityAssistant.js +3 -0
- package/build/dist/Server/Utils/AI/Chat/ObservabilityAssistant.js.map +1 -1
- package/build/dist/Server/Utils/AI/CodeFix/CodeFixAgentCompletion.js +4 -0
- package/build/dist/Server/Utils/AI/CodeFix/CodeFixAgentCompletion.js.map +1 -1
- package/build/dist/Server/Utils/AI/CodeFix/CodeFixReadiness.js +8 -5
- package/build/dist/Server/Utils/AI/CodeFix/CodeFixReadiness.js.map +1 -1
- package/build/dist/Server/Utils/AI/CodeFix/FixRunBudget.js +63 -24
- package/build/dist/Server/Utils/AI/CodeFix/FixRunBudget.js.map +1 -1
- package/build/dist/Server/Utils/AI/Remediation/RemediationExecutionRunner.js +2 -0
- package/build/dist/Server/Utils/AI/Remediation/RemediationExecutionRunner.js.map +1 -1
- package/build/dist/Server/Utils/AI/Remediation/RemediationPlanRunner.js +2 -0
- package/build/dist/Server/Utils/AI/Remediation/RemediationPlanRunner.js.map +1 -1
- package/build/dist/Server/Utils/AI/SRE/AIInvestigationEngine.js +156 -28
- package/build/dist/Server/Utils/AI/SRE/AIInvestigationEngine.js.map +1 -1
- package/build/dist/Server/Utils/AI/SRE/AlertInvestigationRunner.js +21 -19
- package/build/dist/Server/Utils/AI/SRE/AlertInvestigationRunner.js.map +1 -1
- package/build/dist/Server/Utils/AI/SRE/ConfidenceSignal.js +128 -49
- package/build/dist/Server/Utils/AI/SRE/ConfidenceSignal.js.map +1 -1
- package/build/dist/Server/Utils/AI/SRE/FixFromIncidentTaskTrigger.js +170 -31
- package/build/dist/Server/Utils/AI/SRE/FixFromIncidentTaskTrigger.js.map +1 -1
- package/build/dist/Server/Utils/AI/SRE/IncidentInvestigationRunner.js +21 -19
- package/build/dist/Server/Utils/AI/SRE/IncidentInvestigationRunner.js.map +1 -1
- package/build/dist/Server/Utils/AI/SRE/InstrumentationTaskTrigger.js +33 -9
- package/build/dist/Server/Utils/AI/SRE/InstrumentationTaskTrigger.js.map +1 -1
- package/build/dist/Server/Utils/AI/SRE/InvestigationGrader.js +9 -5
- package/build/dist/Server/Utils/AI/SRE/InvestigationGrader.js.map +1 -1
- package/build/dist/Server/Utils/AI/SRE/InvestigationQueue.js +121 -41
- package/build/dist/Server/Utils/AI/SRE/InvestigationQueue.js.map +1 -1
- package/build/dist/Server/Utils/AI/SRE/InvestigationSubjectLock.js +46 -0
- package/build/dist/Server/Utils/AI/SRE/InvestigationSubjectLock.js.map +1 -0
- package/build/dist/Server/Utils/AI/SRE/PostedRootCause.js +61 -14
- package/build/dist/Server/Utils/AI/SRE/PostedRootCause.js.map +1 -1
- package/build/dist/Server/Utils/AI/SRE/SubjectCodeFixRun.js +79 -1
- package/build/dist/Server/Utils/AI/SRE/SubjectCodeFixRun.js.map +1 -1
- package/build/dist/Server/Utils/AI/Toolbox/CodeTools.js +31 -1
- package/build/dist/Server/Utils/AI/Toolbox/CodeTools.js.map +1 -1
- package/build/dist/Server/Utils/AnalyticsDatabase/ClusterConfig.js +21 -0
- package/build/dist/Server/Utils/AnalyticsDatabase/ClusterConfig.js.map +1 -1
- package/build/dist/Server/Utils/AnalyticsDatabase/StatementGenerator.js +13 -0
- package/build/dist/Server/Utils/AnalyticsDatabase/StatementGenerator.js.map +1 -1
- package/build/dist/Server/Utils/CodeRepository/GitHub/GitHub.js +126 -4
- package/build/dist/Server/Utils/CodeRepository/GitHub/GitHub.js.map +1 -1
- package/build/dist/Server/Utils/CodeRepository/GitHub/GitHubInstallationBinding.js +136 -0
- package/build/dist/Server/Utils/CodeRepository/GitHub/GitHubInstallationBinding.js.map +1 -0
- package/build/dist/Server/Utils/Monitor/Criteria/APIRequestCriteria.js +20 -3
- package/build/dist/Server/Utils/Monitor/Criteria/APIRequestCriteria.js.map +1 -1
- package/build/dist/Server/Utils/Monitor/Criteria/DomainMonitorCriteria.js +43 -0
- package/build/dist/Server/Utils/Monitor/Criteria/DomainMonitorCriteria.js.map +1 -1
- package/build/dist/Server/Utils/Monitor/MonitorMetricUtil.js +33 -0
- package/build/dist/Server/Utils/Monitor/MonitorMetricUtil.js.map +1 -1
- package/build/dist/Server/Utils/Monitor/MonitorTemplateUtil.js +1 -0
- package/build/dist/Server/Utils/Monitor/MonitorTemplateUtil.js.map +1 -1
- package/build/dist/Server/Utils/PasswordHash.js +258 -0
- package/build/dist/Server/Utils/PasswordHash.js.map +1 -0
- package/build/dist/Types/AI/AIRunCodeFixRecommendation.js +18 -0
- package/build/dist/Types/AI/AIRunCodeFixRecommendation.js.map +1 -0
- package/build/dist/Types/AI/CodeFixTaskContext.js +23 -3
- package/build/dist/Types/AI/CodeFixTaskContext.js.map +1 -1
- package/build/dist/Types/AI/CodeFixTaskType.js +3 -3
- package/build/dist/Types/Database/ColumnLength.js +9 -1
- package/build/dist/Types/Database/ColumnLength.js.map +1 -1
- package/build/dist/Types/Database/TableColumn.js.map +1 -1
- package/build/dist/Types/Database/UnsynchronizedIndex.js +46 -0
- package/build/dist/Types/Database/UnsynchronizedIndex.js.map +1 -0
- package/build/dist/Types/HashedString.js +96 -5
- package/build/dist/Types/HashedString.js.map +1 -1
- package/build/dist/Types/Monitor/CriteriaFilter.js +4 -0
- package/build/dist/Types/Monitor/CriteriaFilter.js.map +1 -1
- package/build/dist/Types/Monitor/DomainMonitor/DomainLookupMethod.js +24 -0
- package/build/dist/Types/Monitor/DomainMonitor/DomainLookupMethod.js.map +1 -0
- package/build/dist/Types/Monitor/MonitorCriteriaInstance.js +24 -7
- package/build/dist/Types/Monitor/MonitorCriteriaInstance.js.map +1 -1
- package/build/dist/Types/Monitor/MonitorMetricType.js +7 -0
- package/build/dist/Types/Monitor/MonitorMetricType.js.map +1 -1
- package/build/dist/Types/Monitor/MonitorStep.js +6 -1
- package/build/dist/Types/Monitor/MonitorStep.js.map +1 -1
- package/build/dist/Types/Monitor/MonitorStepDomainMonitor.js +15 -0
- package/build/dist/Types/Monitor/MonitorStepDomainMonitor.js.map +1 -1
- package/build/dist/Types/Monitor/PortMonitor/PortMonitorTimings.js +2 -0
- package/build/dist/Types/Monitor/PortMonitor/PortMonitorTimings.js.map +1 -0
- package/build/dist/Types/Permission.js +23 -155
- package/build/dist/Types/Permission.js.map +1 -1
- package/build/dist/UI/Components/BulkUpdate/BulkUpdateForm.js +2 -5
- package/build/dist/UI/Components/BulkUpdate/BulkUpdateForm.js.map +1 -1
- package/build/dist/UI/Components/CustomFields/CustomFieldsDetail.js +51 -10
- package/build/dist/UI/Components/CustomFields/CustomFieldsDetail.js.map +1 -1
- package/build/dist/UI/Components/ErrorBoundary.js +67 -8
- package/build/dist/UI/Components/ErrorBoundary.js.map +1 -1
- package/build/dist/UI/Components/Feed/FeedItem.js +2 -2
- package/build/dist/UI/Components/Feed/FeedItem.js.map +1 -1
- package/build/dist/UI/Components/ModelDetail/CardModelDetail.js +0 -12
- package/build/dist/UI/Components/ModelDetail/CardModelDetail.js.map +1 -1
- package/build/dist/UI/Components/ModelTable/BaseModelTable.js +1 -1
- package/build/dist/UI/Components/ModelTable/BaseModelTable.js.map +1 -1
- package/build/dist/UI/Components/MonitorTemplateVariables/TemplateVariablesCatalog.js +12 -2
- package/build/dist/UI/Components/MonitorTemplateVariables/TemplateVariablesCatalog.js.map +1 -1
- package/build/dist/UI/Components/MoreMenu/MoreMenu.js +193 -65
- package/build/dist/UI/Components/MoreMenu/MoreMenu.js.map +1 -1
- package/build/dist/UI/Components/MoreMenu/MoreMenuItem.js +1 -1
- package/build/dist/UI/Components/MoreMenu/MoreMenuItem.js.map +1 -1
- package/build/dist/UI/Components/Navbar/NavBar.js +3 -1
- package/build/dist/UI/Components/Navbar/NavBar.js.map +1 -1
- package/build/dist/UI/Components/Navbar/NavBarMenuModal.js +19 -7
- package/build/dist/UI/Components/Navbar/NavBarMenuModal.js.map +1 -1
- package/build/dist/UI/Utils/DownloadFile.js +15 -8
- package/build/dist/UI/Utils/DownloadFile.js.map +1 -1
- package/build/dist/UI/Utils/ErrorSupportBundle.js +476 -0
- package/build/dist/UI/Utils/ErrorSupportBundle.js.map +1 -0
- package/build/dist/UI/Utils/ModelAPI/ModelAPI.js +18 -8
- package/build/dist/UI/Utils/ModelAPI/ModelAPI.js.map +1 -1
- package/build/dist/UI/Utils/ModelAPI/UserProjectsModelAPI.js +156 -0
- package/build/dist/UI/Utils/ModelAPI/UserProjectsModelAPI.js.map +1 -0
- package/build/dist/UI/Utils/Project.js +3 -0
- package/build/dist/UI/Utils/Project.js.map +1 -1
- package/build/dist/UI/Utils/StatusPage.js +4 -4
- package/build/dist/UI/Utils/StatusPage.js.map +1 -1
- package/build/dist/UI/Utils/UseDashboardGridDnd.js +551 -0
- package/build/dist/UI/Utils/UseDashboardGridDnd.js.map +1 -0
- package/build/dist/Utils/Dashboard/DashboardViewConfig.js +42 -26
- package/build/dist/Utils/Dashboard/DashboardViewConfig.js.map +1 -1
- package/build/dist/Utils/Dashboard/GridLayout.js +338 -0
- package/build/dist/Utils/Dashboard/GridLayout.js.map +1 -0
- package/build/dist/Utils/Metrics/RecordingRuleExpression.js +19 -17
- package/build/dist/Utils/Metrics/RecordingRuleExpression.js.map +1 -1
- package/build/dist/Utils/Monitor/MonitorMetricType.js +38 -6
- package/build/dist/Utils/Monitor/MonitorMetricType.js.map +1 -1
- package/build/dist/Utils/StatusPage/GroupNestingLayout.js +46 -0
- package/build/dist/Utils/StatusPage/GroupNestingLayout.js.map +1 -1
- package/build/dist/Utils/StatusPage/GroupTree.js +79 -34
- package/build/dist/Utils/StatusPage/GroupTree.js.map +1 -1
- package/build/dist/Utils/StatusPage/ResourceUptime.js +22 -1
- package/build/dist/Utils/StatusPage/ResourceUptime.js.map +1 -1
- package/build/dist/Utils/TeamMembersByProject.js +145 -0
- package/build/dist/Utils/TeamMembersByProject.js.map +1 -0
- package/build/dist/Utils/Telemetry/SavedViewTimeRange.js +79 -0
- package/build/dist/Utils/Telemetry/SavedViewTimeRange.js.map +1 -0
- package/build/dist/Utils/Telemetry/TelemetryQueryTimeRange.js +236 -0
- package/build/dist/Utils/Telemetry/TelemetryQueryTimeRange.js.map +1 -0
- package/package.json +1 -1
|
@@ -0,0 +1,539 @@
|
|
|
1
|
+
import GitHubAPI from "../../../Server/API/GitHubAPI";
|
|
2
|
+
import GitHubUtil from "../../../Server/Utils/CodeRepository/GitHub/GitHub";
|
|
3
|
+
import CodeRepositoryService from "../../../Server/Services/CodeRepositoryService";
|
|
4
|
+
import ProjectService from "../../../Server/Services/ProjectService";
|
|
5
|
+
import AccessTokenService from "../../../Server/Services/AccessTokenService";
|
|
6
|
+
import JSONWebToken from "../../../Server/Utils/JsonWebToken";
|
|
7
|
+
import Response from "../../../Server/Utils/Response";
|
|
8
|
+
import {
|
|
9
|
+
ExpressRequest,
|
|
10
|
+
ExpressResponse,
|
|
11
|
+
NextFunction,
|
|
12
|
+
} from "../../../Server/Utils/Express";
|
|
13
|
+
import { mockRouter } from "./Helpers";
|
|
14
|
+
import Dictionary from "../../../Types/Dictionary";
|
|
15
|
+
import BadDataException from "../../../Types/Exception/BadDataException";
|
|
16
|
+
import NotAuthenticatedException from "../../../Types/Exception/NotAuthenticatedException";
|
|
17
|
+
import NotAuthorizedException from "../../../Types/Exception/NotAuthorizedException";
|
|
18
|
+
import ObjectID from "../../../Types/ObjectID";
|
|
19
|
+
import Permission, {
|
|
20
|
+
UserPermission,
|
|
21
|
+
UserTenantAccessPermission,
|
|
22
|
+
} from "../../../Types/Permission";
|
|
23
|
+
import { JSONObject } from "../../../Types/JSON";
|
|
24
|
+
import {
|
|
25
|
+
afterEach,
|
|
26
|
+
beforeAll,
|
|
27
|
+
beforeEach,
|
|
28
|
+
describe,
|
|
29
|
+
expect,
|
|
30
|
+
test,
|
|
31
|
+
} from "@jest/globals";
|
|
32
|
+
|
|
33
|
+
/*
|
|
34
|
+
* GHSA-xx95-gmcf-7q86 — cross-tenant GitHub repository token minting.
|
|
35
|
+
*
|
|
36
|
+
* Project.gitHubAppInstallationId is what every token-minting path trusts to
|
|
37
|
+
* decide which tenant owns an installation. This file pins the only route
|
|
38
|
+
* allowed to write it.
|
|
39
|
+
*
|
|
40
|
+
* The original hole was that "who owns this installation?" was answered by
|
|
41
|
+
* whoever asked. `/github/auth/install` signed a state for any (project, user)
|
|
42
|
+
* pair named in the query string, without even requiring a session; the
|
|
43
|
+
* callback then took `installation_id` straight off the URL. So an attacker
|
|
44
|
+
* could start an install for a project they own, edit the callback URL to a
|
|
45
|
+
* victim's installation ID, and have OneUptime record their project as the
|
|
46
|
+
* owner — after which the victim's private repositories were imported into it
|
|
47
|
+
* and write-scoped `ghs_` tokens were minted on request.
|
|
48
|
+
*/
|
|
49
|
+
|
|
50
|
+
// The install route refuses to run at all unless a GitHub App is configured.
|
|
51
|
+
jest.mock("../../../Server/EnvironmentConfig", () => {
|
|
52
|
+
return {
|
|
53
|
+
...(jest.requireActual("../../../Server/EnvironmentConfig") as Record<
|
|
54
|
+
string,
|
|
55
|
+
unknown
|
|
56
|
+
>),
|
|
57
|
+
GitHubAppName: "oneuptime-test-app",
|
|
58
|
+
};
|
|
59
|
+
});
|
|
60
|
+
|
|
61
|
+
jest.mock("../../../Server/Utils/Express", () => {
|
|
62
|
+
return {
|
|
63
|
+
getRouter: () => {
|
|
64
|
+
return mockRouter;
|
|
65
|
+
},
|
|
66
|
+
};
|
|
67
|
+
});
|
|
68
|
+
|
|
69
|
+
jest.mock("../../../Server/Utils/Response", () => {
|
|
70
|
+
return {
|
|
71
|
+
sendJsonObjectResponse: jest.fn().mockImplementation((...args: []) => {
|
|
72
|
+
return args;
|
|
73
|
+
}),
|
|
74
|
+
sendEmptySuccessResponse: jest.fn(),
|
|
75
|
+
sendEntityResponse: jest.fn().mockImplementation((...args: []) => {
|
|
76
|
+
return args;
|
|
77
|
+
}),
|
|
78
|
+
sendErrorResponse: jest.fn().mockImplementation((...args: []) => {
|
|
79
|
+
return args;
|
|
80
|
+
}),
|
|
81
|
+
redirect: jest.fn().mockImplementation((...args: []) => {
|
|
82
|
+
return args;
|
|
83
|
+
}),
|
|
84
|
+
};
|
|
85
|
+
});
|
|
86
|
+
|
|
87
|
+
const INSTALL_ROUTE: string = "/github/auth/install";
|
|
88
|
+
const CALLBACK_ROUTE: string = "/github/auth/callback";
|
|
89
|
+
|
|
90
|
+
// The two routes the fix removed.
|
|
91
|
+
const REMOVED_LIST_REPOSITORIES_ROUTE: string =
|
|
92
|
+
"/github/repositories/:projectId/:installationId";
|
|
93
|
+
const REMOVED_CONNECT_ROUTE: string = "/github/repository/connect";
|
|
94
|
+
|
|
95
|
+
function thrownError(): Error | undefined {
|
|
96
|
+
const sendErrorResponse: jest.Mock =
|
|
97
|
+
Response.sendErrorResponse as unknown as jest.Mock;
|
|
98
|
+
|
|
99
|
+
if (sendErrorResponse.mock.calls.length === 0) {
|
|
100
|
+
return undefined;
|
|
101
|
+
}
|
|
102
|
+
|
|
103
|
+
return sendErrorResponse.mock.calls[0]![2] as Error;
|
|
104
|
+
}
|
|
105
|
+
|
|
106
|
+
async function callRoute(data: {
|
|
107
|
+
method: string;
|
|
108
|
+
uri: string;
|
|
109
|
+
query?: Dictionary<string> | undefined;
|
|
110
|
+
userId?: ObjectID | undefined;
|
|
111
|
+
}): Promise<void> {
|
|
112
|
+
const req: ExpressRequest = {
|
|
113
|
+
params: {},
|
|
114
|
+
query: data.query || {},
|
|
115
|
+
body: {},
|
|
116
|
+
headers: {},
|
|
117
|
+
userAuthorization: data.userId
|
|
118
|
+
? {
|
|
119
|
+
userId: data.userId,
|
|
120
|
+
}
|
|
121
|
+
: undefined,
|
|
122
|
+
} as unknown as ExpressRequest;
|
|
123
|
+
|
|
124
|
+
const res: ExpressResponse = {
|
|
125
|
+
send: jest.fn(),
|
|
126
|
+
json: jest.fn(),
|
|
127
|
+
status: jest.fn().mockReturnThis(),
|
|
128
|
+
redirect: jest.fn(),
|
|
129
|
+
} as unknown as ExpressResponse;
|
|
130
|
+
|
|
131
|
+
const next: jest.Mock = jest.fn();
|
|
132
|
+
|
|
133
|
+
await mockRouter
|
|
134
|
+
.match(data.method, data.uri)
|
|
135
|
+
.handlerFunction(req, res, next as unknown as NextFunction);
|
|
136
|
+
}
|
|
137
|
+
|
|
138
|
+
describe("GitHub App installation binding", () => {
|
|
139
|
+
let projectId: ObjectID;
|
|
140
|
+
let userId: ObjectID;
|
|
141
|
+
let victimInstallationId: string;
|
|
142
|
+
|
|
143
|
+
beforeAll(() => {
|
|
144
|
+
mockRouter.routes.length = 0;
|
|
145
|
+
new GitHubAPI().getRouter();
|
|
146
|
+
});
|
|
147
|
+
|
|
148
|
+
beforeEach(() => {
|
|
149
|
+
jest.clearAllMocks();
|
|
150
|
+
projectId = ObjectID.generate();
|
|
151
|
+
userId = ObjectID.generate();
|
|
152
|
+
victimInstallationId = "99999999";
|
|
153
|
+
});
|
|
154
|
+
|
|
155
|
+
afterEach(() => {
|
|
156
|
+
jest.restoreAllMocks();
|
|
157
|
+
});
|
|
158
|
+
|
|
159
|
+
function grantProjectAccess(): void {
|
|
160
|
+
const permission: UserPermission = {
|
|
161
|
+
_type: "UserPermission",
|
|
162
|
+
permission: Permission.ProjectOwner,
|
|
163
|
+
labelIds: [],
|
|
164
|
+
};
|
|
165
|
+
|
|
166
|
+
const tenantPermission: UserTenantAccessPermission = {
|
|
167
|
+
_type: "UserTenantAccessPermission",
|
|
168
|
+
projectId: projectId,
|
|
169
|
+
permissions: [permission],
|
|
170
|
+
};
|
|
171
|
+
|
|
172
|
+
jest
|
|
173
|
+
.spyOn(AccessTokenService, "getUserTenantAccessPermission")
|
|
174
|
+
.mockResolvedValue(tenantPermission);
|
|
175
|
+
}
|
|
176
|
+
|
|
177
|
+
function denyProjectAccess(): void {
|
|
178
|
+
jest
|
|
179
|
+
.spyOn(AccessTokenService, "getUserTenantAccessPermission")
|
|
180
|
+
.mockResolvedValue(null);
|
|
181
|
+
}
|
|
182
|
+
|
|
183
|
+
/*
|
|
184
|
+
* The routes that made the installation ID a client-supplied input. Neither
|
|
185
|
+
* had a caller — the dashboard only ever uses install -> callback — so they
|
|
186
|
+
* are gone rather than patched. If one is ever re-added, it has to justify
|
|
187
|
+
* itself against this advisory first.
|
|
188
|
+
*/
|
|
189
|
+
describe("removed routes", () => {
|
|
190
|
+
test.each([
|
|
191
|
+
["GET", REMOVED_LIST_REPOSITORIES_ROUTE],
|
|
192
|
+
["POST", REMOVED_CONNECT_ROUTE],
|
|
193
|
+
])("%s %s is not registered", (method: string, uri: string) => {
|
|
194
|
+
const exists: boolean = mockRouter.routes.some(
|
|
195
|
+
(route: { method: string; uri: string }) => {
|
|
196
|
+
return route.method === method && route.uri === uri;
|
|
197
|
+
},
|
|
198
|
+
);
|
|
199
|
+
|
|
200
|
+
expect(exists).toBe(false);
|
|
201
|
+
});
|
|
202
|
+
|
|
203
|
+
test("no remaining route accepts an installation id as a request parameter", () => {
|
|
204
|
+
const routesTakingInstallationId: Array<string> = mockRouter.routes
|
|
205
|
+
.filter((route: { uri: string }) => {
|
|
206
|
+
return route.uri.includes(":installationId");
|
|
207
|
+
})
|
|
208
|
+
.map((route: { uri: string }) => {
|
|
209
|
+
return route.uri;
|
|
210
|
+
});
|
|
211
|
+
|
|
212
|
+
expect(routesTakingInstallationId).toEqual([]);
|
|
213
|
+
});
|
|
214
|
+
});
|
|
215
|
+
|
|
216
|
+
describe("GET /github/auth/install", () => {
|
|
217
|
+
test("rejects an unauthenticated caller", async () => {
|
|
218
|
+
await callRoute({ method: "GET", uri: INSTALL_ROUTE, query: {} });
|
|
219
|
+
|
|
220
|
+
expect(thrownError()).toBeInstanceOf(NotAuthenticatedException);
|
|
221
|
+
});
|
|
222
|
+
|
|
223
|
+
test("never signs a state for an unauthenticated caller", async () => {
|
|
224
|
+
const signSpy: jest.SpyInstance = jest.spyOn(
|
|
225
|
+
JSONWebToken,
|
|
226
|
+
"signJsonPayload",
|
|
227
|
+
);
|
|
228
|
+
|
|
229
|
+
await callRoute({
|
|
230
|
+
method: "GET",
|
|
231
|
+
uri: INSTALL_ROUTE,
|
|
232
|
+
query: { projectId: projectId.toString(), userId: userId.toString() },
|
|
233
|
+
});
|
|
234
|
+
|
|
235
|
+
expect(thrownError()).toBeInstanceOf(NotAuthenticatedException);
|
|
236
|
+
expect(signSpy).not.toHaveBeenCalled();
|
|
237
|
+
});
|
|
238
|
+
|
|
239
|
+
test("rejects a caller who is not a member of the project", async () => {
|
|
240
|
+
denyProjectAccess();
|
|
241
|
+
|
|
242
|
+
await callRoute({
|
|
243
|
+
method: "GET",
|
|
244
|
+
uri: INSTALL_ROUTE,
|
|
245
|
+
query: { projectId: projectId.toString() },
|
|
246
|
+
userId: userId,
|
|
247
|
+
});
|
|
248
|
+
|
|
249
|
+
expect(thrownError()).toBeInstanceOf(NotAuthorizedException);
|
|
250
|
+
});
|
|
251
|
+
|
|
252
|
+
test("requires a project id", async () => {
|
|
253
|
+
await callRoute({
|
|
254
|
+
method: "GET",
|
|
255
|
+
uri: INSTALL_ROUTE,
|
|
256
|
+
query: {},
|
|
257
|
+
userId: userId,
|
|
258
|
+
});
|
|
259
|
+
|
|
260
|
+
expect(thrownError()).toBeInstanceOf(BadDataException);
|
|
261
|
+
});
|
|
262
|
+
|
|
263
|
+
/*
|
|
264
|
+
* The state binds the install to a user. Taking that user from the query
|
|
265
|
+
* string let anyone mint a state naming somebody else; it must come from
|
|
266
|
+
* the session.
|
|
267
|
+
*/
|
|
268
|
+
test("ignores a userId in the query string and uses the session user", async () => {
|
|
269
|
+
grantProjectAccess();
|
|
270
|
+
|
|
271
|
+
const spoofedUserId: ObjectID = ObjectID.generate();
|
|
272
|
+
const signSpy: jest.SpyInstance = jest
|
|
273
|
+
.spyOn(JSONWebToken, "signJsonPayload")
|
|
274
|
+
.mockReturnValue("signed-state");
|
|
275
|
+
|
|
276
|
+
await callRoute({
|
|
277
|
+
method: "GET",
|
|
278
|
+
uri: INSTALL_ROUTE,
|
|
279
|
+
query: {
|
|
280
|
+
projectId: projectId.toString(),
|
|
281
|
+
userId: spoofedUserId.toString(),
|
|
282
|
+
},
|
|
283
|
+
userId: userId,
|
|
284
|
+
});
|
|
285
|
+
|
|
286
|
+
expect(signSpy).toHaveBeenCalledTimes(1);
|
|
287
|
+
|
|
288
|
+
const payload: JSONObject = signSpy.mock.calls[0]![0] as JSONObject;
|
|
289
|
+
expect(payload["userId"]).toBe(userId.toString());
|
|
290
|
+
expect(payload["userId"]).not.toBe(spoofedUserId.toString());
|
|
291
|
+
expect(payload["projectId"]).toBe(projectId.toString());
|
|
292
|
+
});
|
|
293
|
+
|
|
294
|
+
test("checks project access for the session user, not the query user", async () => {
|
|
295
|
+
grantProjectAccess();
|
|
296
|
+
jest.spyOn(JSONWebToken, "signJsonPayload").mockReturnValue("state");
|
|
297
|
+
|
|
298
|
+
const accessSpy: jest.SpyInstance = jest.spyOn(
|
|
299
|
+
AccessTokenService,
|
|
300
|
+
"getUserTenantAccessPermission",
|
|
301
|
+
);
|
|
302
|
+
|
|
303
|
+
await callRoute({
|
|
304
|
+
method: "GET",
|
|
305
|
+
uri: INSTALL_ROUTE,
|
|
306
|
+
query: {
|
|
307
|
+
projectId: projectId.toString(),
|
|
308
|
+
userId: ObjectID.generate().toString(),
|
|
309
|
+
},
|
|
310
|
+
userId: userId,
|
|
311
|
+
});
|
|
312
|
+
|
|
313
|
+
expect(accessSpy).toHaveBeenCalledTimes(1);
|
|
314
|
+
expect((accessSpy.mock.calls[0]![0] as ObjectID).toString()).toBe(
|
|
315
|
+
userId.toString(),
|
|
316
|
+
);
|
|
317
|
+
expect((accessSpy.mock.calls[0]![1] as ObjectID).toString()).toBe(
|
|
318
|
+
projectId.toString(),
|
|
319
|
+
);
|
|
320
|
+
});
|
|
321
|
+
|
|
322
|
+
test("redirects a legitimate member to GitHub", async () => {
|
|
323
|
+
grantProjectAccess();
|
|
324
|
+
jest.spyOn(JSONWebToken, "signJsonPayload").mockReturnValue("state");
|
|
325
|
+
|
|
326
|
+
await callRoute({
|
|
327
|
+
method: "GET",
|
|
328
|
+
uri: INSTALL_ROUTE,
|
|
329
|
+
query: { projectId: projectId.toString() },
|
|
330
|
+
userId: userId,
|
|
331
|
+
});
|
|
332
|
+
|
|
333
|
+
expect(thrownError()).toBeUndefined();
|
|
334
|
+
expect(Response.redirect).toHaveBeenCalledTimes(1);
|
|
335
|
+
});
|
|
336
|
+
});
|
|
337
|
+
|
|
338
|
+
describe("GET /github/auth/callback", () => {
|
|
339
|
+
let updateProjectSpy: jest.SpyInstance;
|
|
340
|
+
let importSpy: jest.SpyInstance;
|
|
341
|
+
let verifySpy: jest.SpyInstance;
|
|
342
|
+
|
|
343
|
+
beforeEach(() => {
|
|
344
|
+
jest.spyOn(JSONWebToken, "decodeJsonPayload").mockReturnValue({
|
|
345
|
+
projectId: projectId.toString(),
|
|
346
|
+
userId: userId.toString(),
|
|
347
|
+
});
|
|
348
|
+
|
|
349
|
+
grantProjectAccess();
|
|
350
|
+
|
|
351
|
+
updateProjectSpy = jest.spyOn(ProjectService, "updateOneById");
|
|
352
|
+
updateProjectSpy.mockResolvedValue(1);
|
|
353
|
+
|
|
354
|
+
importSpy = jest.spyOn(
|
|
355
|
+
CodeRepositoryService,
|
|
356
|
+
"importReposFromInstallation",
|
|
357
|
+
);
|
|
358
|
+
importSpy.mockResolvedValue({ imported: 0, skipped: 0 });
|
|
359
|
+
|
|
360
|
+
verifySpy = jest.spyOn(GitHubUtil, "assertUserControlsInstallation");
|
|
361
|
+
verifySpy.mockResolvedValue(undefined);
|
|
362
|
+
});
|
|
363
|
+
|
|
364
|
+
function callbackQuery(overrides?: Dictionary<string>): Dictionary<string> {
|
|
365
|
+
return {
|
|
366
|
+
state: "signed-state",
|
|
367
|
+
installation_id: victimInstallationId,
|
|
368
|
+
code: "oauth-code",
|
|
369
|
+
...(overrides || {}),
|
|
370
|
+
};
|
|
371
|
+
}
|
|
372
|
+
|
|
373
|
+
test("binds the installation to the project once GitHub confirms the installer controls it", async () => {
|
|
374
|
+
await callRoute({
|
|
375
|
+
method: "GET",
|
|
376
|
+
uri: CALLBACK_ROUTE,
|
|
377
|
+
query: callbackQuery(),
|
|
378
|
+
});
|
|
379
|
+
|
|
380
|
+
expect(thrownError()).toBeUndefined();
|
|
381
|
+
expect(updateProjectSpy).toHaveBeenCalledTimes(1);
|
|
382
|
+
|
|
383
|
+
const updateArgs: {
|
|
384
|
+
id: ObjectID;
|
|
385
|
+
data: { gitHubAppInstallationId?: string };
|
|
386
|
+
} = updateProjectSpy.mock.calls[0]![0] as {
|
|
387
|
+
id: ObjectID;
|
|
388
|
+
data: { gitHubAppInstallationId?: string };
|
|
389
|
+
};
|
|
390
|
+
expect(updateArgs.id.toString()).toBe(projectId.toString());
|
|
391
|
+
expect(updateArgs.data.gitHubAppInstallationId).toBe(
|
|
392
|
+
victimInstallationId,
|
|
393
|
+
);
|
|
394
|
+
});
|
|
395
|
+
|
|
396
|
+
test("verifies the exact installation id from the URL, not some other one", async () => {
|
|
397
|
+
await callRoute({
|
|
398
|
+
method: "GET",
|
|
399
|
+
uri: CALLBACK_ROUTE,
|
|
400
|
+
query: callbackQuery(),
|
|
401
|
+
});
|
|
402
|
+
|
|
403
|
+
expect(verifySpy).toHaveBeenCalledTimes(1);
|
|
404
|
+
|
|
405
|
+
const verifyArgs: { oauthCode: string; installationId: string } =
|
|
406
|
+
verifySpy.mock.calls[0]![0] as {
|
|
407
|
+
oauthCode: string;
|
|
408
|
+
installationId: string;
|
|
409
|
+
};
|
|
410
|
+
expect(verifyArgs.installationId).toBe(victimInstallationId);
|
|
411
|
+
expect(verifyArgs.oauthCode).toBe("oauth-code");
|
|
412
|
+
});
|
|
413
|
+
|
|
414
|
+
/*
|
|
415
|
+
* The core of the fix. A valid state only proves "this user asked to
|
|
416
|
+
* install something for this project" — it says nothing about WHICH
|
|
417
|
+
* installation. Without the OAuth round trip, hand-editing installation_id
|
|
418
|
+
* is enough to claim someone else's installation.
|
|
419
|
+
*/
|
|
420
|
+
test("refuses to bind an installation the installer does not control", async () => {
|
|
421
|
+
verifySpy.mockRejectedValue(
|
|
422
|
+
new BadDataException("does not have access to this installation"),
|
|
423
|
+
);
|
|
424
|
+
|
|
425
|
+
await callRoute({
|
|
426
|
+
method: "GET",
|
|
427
|
+
uri: CALLBACK_ROUTE,
|
|
428
|
+
query: callbackQuery(),
|
|
429
|
+
});
|
|
430
|
+
|
|
431
|
+
expect(thrownError()).toBeInstanceOf(BadDataException);
|
|
432
|
+
expect(updateProjectSpy).not.toHaveBeenCalled();
|
|
433
|
+
expect(importSpy).not.toHaveBeenCalled();
|
|
434
|
+
});
|
|
435
|
+
|
|
436
|
+
test("refuses to bind when GitHub returned no OAuth code to verify with", async () => {
|
|
437
|
+
const query: Dictionary<string> = callbackQuery();
|
|
438
|
+
delete query["code"];
|
|
439
|
+
|
|
440
|
+
await callRoute({
|
|
441
|
+
method: "GET",
|
|
442
|
+
uri: CALLBACK_ROUTE,
|
|
443
|
+
query: query,
|
|
444
|
+
});
|
|
445
|
+
|
|
446
|
+
expect(thrownError()).toBeInstanceOf(BadDataException);
|
|
447
|
+
expect(verifySpy).not.toHaveBeenCalled();
|
|
448
|
+
expect(updateProjectSpy).not.toHaveBeenCalled();
|
|
449
|
+
expect(importSpy).not.toHaveBeenCalled();
|
|
450
|
+
});
|
|
451
|
+
|
|
452
|
+
/*
|
|
453
|
+
* Import is what pulls the victim's private repositories into the
|
|
454
|
+
* attacker's project, so it must sit strictly behind verification.
|
|
455
|
+
*/
|
|
456
|
+
test("does not import any repositories when verification fails", async () => {
|
|
457
|
+
verifySpy.mockRejectedValue(new BadDataException("nope"));
|
|
458
|
+
|
|
459
|
+
await callRoute({
|
|
460
|
+
method: "GET",
|
|
461
|
+
uri: CALLBACK_ROUTE,
|
|
462
|
+
query: callbackQuery(),
|
|
463
|
+
});
|
|
464
|
+
|
|
465
|
+
expect(importSpy).not.toHaveBeenCalled();
|
|
466
|
+
});
|
|
467
|
+
|
|
468
|
+
test("verifies before writing the binding", async () => {
|
|
469
|
+
const callOrder: Array<string> = [];
|
|
470
|
+
|
|
471
|
+
verifySpy.mockImplementation(async (): Promise<void> => {
|
|
472
|
+
callOrder.push("verify");
|
|
473
|
+
});
|
|
474
|
+
updateProjectSpy.mockImplementation(async (): Promise<void> => {
|
|
475
|
+
callOrder.push("bind");
|
|
476
|
+
});
|
|
477
|
+
|
|
478
|
+
await callRoute({
|
|
479
|
+
method: "GET",
|
|
480
|
+
uri: CALLBACK_ROUTE,
|
|
481
|
+
query: callbackQuery(),
|
|
482
|
+
});
|
|
483
|
+
|
|
484
|
+
expect(callOrder).toEqual(["verify", "bind"]);
|
|
485
|
+
});
|
|
486
|
+
|
|
487
|
+
test("rejects a caller whose state names a project they cannot access", async () => {
|
|
488
|
+
denyProjectAccess();
|
|
489
|
+
|
|
490
|
+
await callRoute({
|
|
491
|
+
method: "GET",
|
|
492
|
+
uri: CALLBACK_ROUTE,
|
|
493
|
+
query: callbackQuery(),
|
|
494
|
+
});
|
|
495
|
+
|
|
496
|
+
expect(thrownError()).toBeInstanceOf(NotAuthorizedException);
|
|
497
|
+
expect(verifySpy).not.toHaveBeenCalled();
|
|
498
|
+
expect(updateProjectSpy).not.toHaveBeenCalled();
|
|
499
|
+
});
|
|
500
|
+
|
|
501
|
+
test("rejects a missing state", async () => {
|
|
502
|
+
const query: Dictionary<string> = callbackQuery();
|
|
503
|
+
delete query["state"];
|
|
504
|
+
|
|
505
|
+
await callRoute({ method: "GET", uri: CALLBACK_ROUTE, query: query });
|
|
506
|
+
|
|
507
|
+
expect(thrownError()).toBeInstanceOf(BadDataException);
|
|
508
|
+
expect(updateProjectSpy).not.toHaveBeenCalled();
|
|
509
|
+
});
|
|
510
|
+
|
|
511
|
+
test("rejects a state that is not signed by this instance", async () => {
|
|
512
|
+
jest
|
|
513
|
+
.spyOn(JSONWebToken, "decodeJsonPayload")
|
|
514
|
+
.mockImplementation((): never => {
|
|
515
|
+
throw new Error("invalid signature");
|
|
516
|
+
});
|
|
517
|
+
|
|
518
|
+
await callRoute({
|
|
519
|
+
method: "GET",
|
|
520
|
+
uri: CALLBACK_ROUTE,
|
|
521
|
+
query: callbackQuery(),
|
|
522
|
+
});
|
|
523
|
+
|
|
524
|
+
expect(thrownError()).toBeInstanceOf(BadDataException);
|
|
525
|
+
expect(verifySpy).not.toHaveBeenCalled();
|
|
526
|
+
expect(updateProjectSpy).not.toHaveBeenCalled();
|
|
527
|
+
});
|
|
528
|
+
|
|
529
|
+
test("rejects a missing installation id", async () => {
|
|
530
|
+
const query: Dictionary<string> = callbackQuery();
|
|
531
|
+
delete query["installation_id"];
|
|
532
|
+
|
|
533
|
+
await callRoute({ method: "GET", uri: CALLBACK_ROUTE, query: query });
|
|
534
|
+
|
|
535
|
+
expect(thrownError()).toBeInstanceOf(BadDataException);
|
|
536
|
+
expect(updateProjectSpy).not.toHaveBeenCalled();
|
|
537
|
+
});
|
|
538
|
+
});
|
|
539
|
+
});
|
|
@@ -31,11 +31,16 @@ const mockRouterForMethod: MockRouterForMethodFunction = (method: string) => {
|
|
|
31
31
|
middleware: RouterFunction,
|
|
32
32
|
handlerFunction: RouterFunction,
|
|
33
33
|
): void => {
|
|
34
|
+
/*
|
|
35
|
+
* Routes registered without middleware — router.get(uri, handler) — hand
|
|
36
|
+
* us the handler in the middleware slot. Normalise so `handlerFunction` is
|
|
37
|
+
* always the thing that actually serves the request.
|
|
38
|
+
*/
|
|
34
39
|
mockRouter.routes.push({
|
|
35
40
|
method: method.toUpperCase(),
|
|
36
41
|
uri,
|
|
37
42
|
middleware,
|
|
38
|
-
handlerFunction,
|
|
43
|
+
handlerFunction: handlerFunction || middleware,
|
|
39
44
|
});
|
|
40
45
|
};
|
|
41
46
|
};
|