pengjunjie/server
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/server.git synced 2026-04-07 14:04:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request 'feature/admin-panel2' (#60) from feature/admin-panel2 into release/v9.1.0

Browse Source 
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/server/pulls/60
This commit is contained in:
Sergey Konovalov
2025-09-12 22:12:25 +00:00
parent 8b10fab93c 3ab65b1d7d
commit 83e0970857
5 changed files with 84 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Common/config/default.json
View File

@ -1,6 +1,7 @@
{
"adminPanel": {
"jwtSecret": "secret"
"jwtSecret": "secret",
"port": 9000
},
"statsd": {
"useMetrics": false,
@ -613,6 +614,13 @@
"uncompressed": "50MB",
"template": "*.xml"
}
},
{
"type": "vsdx;vstx;vssx;vsdm;vstm;vssm",
"zip": {
"uncompressed": "50MB",
"template": "*.xml"
}
}
]
}

7
Common/config/development-linux.json
View File

@ -106,6 +106,13 @@
"uncompressed": "1GB",
"template": "*.xml"
}
},
{
"type": "vsdx;vstx;vssx;vsdm;vstm;vssm",
"zip": {
"uncompressed": "1GB",
"template": "*.xml"
}
}
]
}

7
Common/config/development-mac.json
View File

@ -113,6 +113,13 @@
"uncompressed": "1GB",
"template": "*.xml"
}
},
{
"type": "vsdx;vstx;vssx;vsdm;vstm;vssm",
"zip": {
"uncompressed": "1GB",
"template": "*.xml"
}
}
]
}

7
Common/config/development-windows.json
View File

@ -113,6 +113,13 @@
"uncompressed": "1GB",
"template": "*.xml"
}
},
{
"type": "vsdx;vstx;vssx;vsdm;vstm;vssm",
"zip": {
"uncompressed": "1GB",
"template": "*.xml"
}
}
]
}

57
Common/config/schemas/config.schema.json
View File

@ -35,6 +35,42 @@
"step": {"type": "string", "enum": ["1m", "5m", "10m", "15m", "30m"]}
}
},
"ipfilter": {
"type": "object",
"additionalProperties": false,
"x-scope": ["admin", "tenant"],
"properties": {
"rules": {
"type": "array",
"description": "Array of IP filtering rules",
"items": {
"type": "object",
"additionalProperties": false,
"required": ["address", "allowed"],
"properties": {
"address": {
"type": "string",
"description": "IP address, CIDR notation, or '*' for all (e.g., '192.168.1.0/24', '10.0.0.1', '*')"
},
"allowed": {
"type": "boolean",
"description": "Whether this address/range is allowed (true) or denied (false)"
}
}
}
},
"useforrequest": {
"type": "boolean",
"description": "Whether to use IP filtering for requests"
},
"errorcode": {
"type": "integer",
"minimum": 400,
"maximum": 599,
"description": "HTTP error code to return when IP is not allowed"
}
}
},
"sql": {
"type": "object",
"description": "Database connection settings for the CoAuthoring service",
@ -69,6 +105,21 @@
}
}
},
"request-filtering-agent": {
"type": "object",
"additionalProperties": false,
"x-scope": ["admin", "tenant"],
"properties": {
"allowPrivateIPAddress": {
"type": "boolean",
"description": "Whether to allow requests from private IP addresses"
},
"allowMetaIPAddress": {
"type": "boolean",
"description": "Whether to allow requests from meta IP addresses"
}
}
},
"FileConverter": {
"type": "object",
"additionalProperties": false,
@ -77,7 +128,7 @@
"type": "object",
"additionalProperties": false,
"properties": {
"maxDownloadBytes": {"type": "integer", "minimum": 0, "maximum": 104857600, "x-scope": ["admin", "tenant"]},
"maxDownloadBytes": {"type": "integer", "minimum": 0, "maximum": 10485760000, "x-scope": ["admin", "tenant"]},
"inputLimits": {
"type": "array",
"x-scope": ["admin", "tenant"],
@ -152,8 +203,8 @@
"type": "object",
"additionalProperties": false,
"properties": {
"from": {"type": "string"},
"to": {"type": "string"}
"from": {"type": "string", "format": "email"},
"to": {"type": "string", "format": "email"}
}
}
}