RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-25 11:48:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #42183 from SMIL-Infra/fix-ac-lang

Browse Source 
mgr/dashboard: fix Accept-Language header parsing
This commit is contained in:
Alfonso Martínez 2021-07-07 11:15:58 +02:00 committed by GitHub
commit ffdd2bbbb6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/pybind/mgr/dashboard/controllers/home.py
View File

@ -58,7 +58,7 @@ class LanguageMixin(object):
class HomeController(BaseController, LanguageMixin):
LANG_TAG_SEQ_RE = re.compile(r'\s*([^,]+)\s*,?\s*')
LANG_TAG_RE = re.compile(
r'^(?P<locale>[a-zA-Z]{1,8}(-[a-zA-Z0-9]{1,8})?)(;q=(?P<weight>[01]\.\d{0,3}))?$')
r'^(?P<locale>[a-zA-Z]{1,8}(-[a-zA-Z0-9]{1,8})*|\*)(;q=(?P<weight>[01]\.\d{0,3}))?$')
MAX_ACCEPTED_LANGS = 10
@lru_cache()

7
src/pybind/mgr/dashboard/tests/test_home.py
View File

@ -64,3 +64,10 @@ class HomeTest(ControllerTestCase, FakeFsMixin):
self.assertStatus(200)
logger.info(self.body)
self.assertIn('<html lang="en">', self.body.decode('utf-8'))
@mock.patch(FakeFsMixin.builtins_open, new=FakeFsMixin.f_open)
@mock.patch('os.stat', new=FakeFsMixin.f_os.stat)
@mock.patch('os.listdir', new=FakeFsMixin.f_os.listdir)
def test_home_multiple_subtags_lang(self):
self._get('/', headers=[('Accept-Language', 'zh-Hans-CN')])
self.assertStatus(200)