Browse Source

Fix DISABLE_LOCAL_SEARCH blocking request to local search API (#5411)

develop
Florent GitHub 3 days ago
parent
commit
fbad149ff2
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 3 additions and 31 deletions
  1. +2
    -2
      config/default.yaml
  2. +1
    -1
      server/helpers/custom-validators/search.ts
  3. +0
    -1
      server/lib/search.ts
  4. +0
    -5
      server/tests/api/check-params/search.ts
  5. +0
    -22
      server/tests/api/search/search-index.ts

+ 2
- 2
config/default.yaml View File

@@ -730,9 +730,9 @@ search:
# You should deploy your own with https://framagit.org/framasoft/peertube/search-index,
# and can use https://search.joinpeertube.org/ for tests, but keep in mind the latter is an unmoderated search index
url: ''
# You can disable local search, so users only use the search index
# You can disable local search in the client, so users only use the search index
disable_local_search: false
# If you did not disable local search, you can decide to use the search index by default
# If you did not disable local search in the client, you can decide to use the search index by default
is_default_search: false

# PeerTube client/interface configuration


+ 1
- 1
server/helpers/custom-validators/search.ts View File

@@ -20,7 +20,7 @@ function isSearchTargetValid (value: SearchTargetType) {

const searchIndexConfig = CONFIG.SEARCH.SEARCH_INDEX

if (value === 'local' && (!searchIndexConfig.ENABLED || !searchIndexConfig.DISABLE_LOCAL_SEARCH)) return true
if (value === 'local') return true

if (value === 'search-index' && searchIndexConfig.ENABLED) return true



+ 0
- 1
server/lib/search.ts View File

@@ -12,7 +12,6 @@ function isSearchIndexSearch (query: SearchTargetQuery) {

if (searchIndexConfig.ENABLED !== true) return false

if (searchIndexConfig.DISABLE_LOCAL_SEARCH) return true
if (searchIndexConfig.IS_DEFAULT_SEARCH && !query.searchTarget) return true

return false


+ 0
- 5
server/tests/api/check-params/search.ts View File

@@ -251,11 +251,6 @@ describe('Test videos API validator', function () {

await updateSearchIndex(server, true, true)

{
const customQuery = { ...query, searchTarget: 'local' }
await makeGetRequest({ url: server.url, path, query: customQuery, expectedStatus: HttpStatusCode.BAD_REQUEST_400 })
}

{
const customQuery = { ...query, searchTarget: 'search-index' }
await makeGetRequest({ url: server.url, path, query: customQuery, expectedStatus: HttpStatusCode.OK_200 })


+ 0
- 22
server/tests/api/search/search-index.ts View File

@@ -81,28 +81,6 @@ describe('Test index search', function () {
const body = await command.searchChannels({ search: 'root' })
expect(body.total).to.be.greaterThan(2)
})

it('Should make an index videos search if local search is disabled', async function () {
await server.config.updateCustomSubConfig({
newConfig: {
search: {
searchIndex: {
enabled: true,
isDefaultSearch: false,
disableLocalSearch: true
}
}
}
})

const body = await command.searchVideos({ search: 'local video' })
expect(body.total).to.be.greaterThan(2)
})

it('Should make an index channels search if local search is disabled', async function () {
const body = await command.searchChannels({ search: 'root' })
expect(body.total).to.be.greaterThan(2)
})
})

describe('Videos search', async function () {


Loading…
Cancel
Save