diff --git a/docker-compose.yml b/docker-compose.yml index aa4cddb7bb..acb34df5a4 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -455,4 +455,3 @@ volumes: mongo_data: # letsencrypt_etc: # letsencrypt_html: - diff --git a/docker-compose2.yml b/docker-compose2.yml index 64cbb9a4a0..95f4e36fab 100644 --- a/docker-compose2.yml +++ b/docker-compose2.yml @@ -455,4 +455,3 @@ volumes: mongo_data: # letsencrypt_etc: # letsencrypt_html: - diff --git a/modules/invenio-oaiserver/invenio_oaiserver/query.py b/modules/invenio-oaiserver/invenio_oaiserver/query.py index 9c492bca1d..e7946f1b16 100644 --- a/modules/invenio-oaiserver/invenio_oaiserver/query.py +++ b/modules/invenio-oaiserver/invenio_oaiserver/query.py @@ -152,7 +152,7 @@ def get_descendant_ids(index_id): descendant_ids = db.session.query(cte.c.descendant_id).all() return [descendant_id[0] for descendant_id in descendant_ids] - + page_ = kwargs.get('resumptionToken', {}).get('page', 1) size_ = current_app.config['OAISERVER_PAGE_SIZE'] @@ -187,20 +187,26 @@ def get_descendant_ids(index_id): #search = search.query('match', **{'path': kwargs['set']}) #search = search.query('match', **{'_oai.sets': sets}) #search = search.query('terms', **{'_oai.sets': sets}) - + if not sets: search = search.query('match_none') else: index_ids = [sets] + get_descendant_ids(sets) search = search.query('terms', **{'_oai.sets': index_ids}) - time_range = {} - if 'from_' in kwargs: - time_range['gte'] = kwargs['from_'] - if 'until' in kwargs: - time_range['lte'] = kwargs['until'] - if time_range: - search = search.filter('range', **{'_updated': time_range}) + if current_app.config.get('WEKO_SEARCH_FIX_ACCESSRIGHTS', False): + if 'from_' in kwargs or 'until' in kwargs: + rq = range_query(kwargs.get('from_'), kwargs.get('until')) + if rq is not None: + search = search.filter(rq) + else: + time_range = {} + if 'from_' in kwargs: + time_range['gte'] = kwargs['from_'] + if 'until' in kwargs: + time_range['lte'] = kwargs['until'] + if time_range: + search = search.filter('range', **{'_updated': time_range}) search = search.query('match', **{'relation_version_is_last': 'true'}) search = search.query('terms', **{'publish_status': [ @@ -288,3 +294,175 @@ def items(self): } return Pagination(response) + +def range_query(_from=None, _until=None): + """Generate a search query considering update date changes. + + Args: + _from (datetime or str or None): + Lower bound of update date. + _until (datetime or str or None): + Upper bound of update date. + + Returns: + elasticsearch_dsl.query.Q or None: + The generated query object, or None if no range is specified. + """ + + if isinstance(_from, datetime): + from_date = _from.strftime('%Y-%m-%d') + _from = _from.isoformat() + elif isinstance(_from, str) and len(_from) >= 10: + from_date = _from[:10] + else: + _from = None + + if isinstance(_until, datetime): + until_date = _until.strftime('%Y-%m-%d') + _until = _until.isoformat() + elif isinstance(_until, str) and len(_until) >= 10: + until_date = _until[:10] + else: + _until = None + + if _from is None and _until is None: + return None + + now = datetime.now().strftime('%Y-%m-%d') + + # First should condition + + must_not_embargoed = Q( + 'bool', must_not=[Q('term', accessRights='embargoed access')] + ) + must_not_content_accessrole = Q( + 'bool', must_not=[ + Q( + 'nested', + path='content', + query=Q('exists', field='content.accessrole.raw') + ) + ] + ) + must_not_open_access = Q( + 'nested', + path='content', + query=Q( + 'bool', + must_not=[ + Q('term', **{'content.accessrole.raw': 'open_access'}), + Q( + 'bool', + must=[ + Q('term', **{'content.accessrole.raw': 'open_date'}), + Q('range', **{'content.date.dateValue.raw': {'lte': now}}) + ] + ) + ] + ) + ) + should1 = Q( + 'bool', + must=[ + Q( + 'bool', + should=[ + must_not_embargoed, + must_not_content_accessrole, + must_not_open_access + ] + ), + Q( + 'range', + **{ + '_updated': { + **({'gte': _from} if _from else {}), + **({'lte': _until} if _until else {}) + } + } + ) + ] + ) + + # Second should condition + must_not_open_access2 = Q( + 'nested', + path='content', + query=Q( + 'bool', + must_not=[ + Q('term', **{'content.accessrole.raw': 'open_access'}), + Q( + 'bool', + must=[ + Q('term', **{'content.accessrole.raw': 'open_date'}), + Q('range', **{'content.date.dateValue.raw': {'lte': now}}) + ] + ) + ] + ) + ) + + # from condition + from_should = [] + if _from: + from_should.append( + Q( + 'nested', + path='content', + query=Q( + 'bool', + must=[ + Q('term', **{'content.accessrole.raw': 'open_date'}), + Q('range', **{'content.date.dateValue.raw': {'gte': from_date}}) + ] + ) + ) + ) + from_should.append(Q('range', **{'_updated': {'gte': _from}})) + + # until condition + until_must = [] + if _until: + until_must.append( + Q( + 'bool', + must_not=[ + Q( + 'nested', + path='content', + query=Q( + 'bool', + must=[ + Q('term', **{'content.accessrole.raw': 'open_date'}), + Q('range', **{'content.date.dateValue.raw': {'gt': until_date}}) + ] + ) + ) + ] + ) + ) + until_must.append(Q('range', **{'_updated': {'lte': _until}})) + + must2 = [ + Q('term', accessRights='embargoed access'), + Q( + 'nested', + path='content', + query=Q('exists', field='content.accessrole.raw') + ), + Q('bool', must_not=[must_not_open_access2]) + ] + if from_should: + must2.append(Q('bool', should=from_should)) + if until_must: + must2.extend(until_must) + + should2 = Q('bool', must=must2) + + # Overall should + return Q( + 'bool', + should=[should1, should2], + minimum_should_match=1 + ) diff --git a/modules/invenio-oaiserver/tests/test_query.py b/modules/invenio-oaiserver/tests/test_query.py index 63c18b2515..e62d2283db 100644 --- a/modules/invenio-oaiserver/tests/test_query.py +++ b/modules/invenio-oaiserver/tests/test_query.py @@ -1,4 +1,3 @@ - import pytest from mock import patch import uuid @@ -15,7 +14,8 @@ from invenio_oaiserver.query import ( query_string_parser, get_affected_records, - get_records + get_records, + range_query ) # .tox/c1/bin/pytest --cov=invenio_oaiserver tests/test_query.py -vv -s --cov-branch --cov-report=term --cov-report=html --basetemp=/code/modules/invenio-oaiserver/.tox/c1/tmp @@ -28,7 +28,7 @@ def test_query_string_parser(es_app): assert type(result) == QueryString assert result.name == "query_string" assert result.to_dict() == {"query_string":{"query":"test_path"}} - + # current_oaiserver not have query_parse, config is not str current_app.config.update(OAISERVER_QUERY_PARSER=Q) delattr(current_oaiserver,"query_parser") @@ -36,7 +36,7 @@ def test_query_string_parser(es_app): assert type(result) == QueryString assert result.name == "query_string" assert result.to_dict() == {"query_string":{"query":"test_path"}} - + # current_oaiserver have query_parse result = query_string_parser("test_path") assert type(result) == QueryString @@ -53,23 +53,23 @@ def test_get_affected_records(es_app): result = get_affected_records(None,None) for i in result: pass - + spec="1671155386910" search_path = 'path:"1671155386910"' # exist spec, not exist search_path result = get_affected_records(spec,None) for i in result: assert i - + # not exist spec, exist search_path result = get_affected_records(None,search_path) for i in result: assert i - + result = get_affected_records(spec,search_path) for i in result: assert i - + #def get_records(**kwargs): # .tox/c1/bin/pytest --cov=invenio_oaiserver tests/test_query.py::test_get_records -vv -s --cov-branch --cov-report=term --basetemp=/code/modules/invenio-oaiserver/.tox/c1/tmp @@ -102,9 +102,9 @@ def test_get_records(es_app,db, mock_execute): db.session.add_all(indexes) db.session.add(rec1) db.session.add(rec2) - + db.session.commit() - + es_info = dict(id=str(rec_uuid1), index=current_app.config['INDEXER_DEFAULT_INDEX'], doc_type=current_app.config['INDEXER_DEFAULT_DOCTYPE']) @@ -119,21 +119,21 @@ def test_get_records(es_app,db, mock_execute): version_type='external_gte', body=rec_data2) current_search_client.index(**{**es_info,**body}) - + # not scroll_id, ":" not in set data = { "set":"12345" } result = get_records(**data) assert result - + # not scroll_id, ":" in set data = { "set":"12345:6789" } result = get_records(**data) assert result - + # not scroll_id, "set" not in data, exist "from_","until" in data data = { "from_":"2022-01-01", @@ -141,7 +141,7 @@ def test_get_records(es_app,db, mock_execute): } result = get_records(**data) assert result - + # in scroll_id data = { "resumptionToken":{"page":1,"scroll_id":"DXF1ZXJ5QW5kRmV0Y2gBAAAAAAAAVfgWYmVhQ3BkbEdSSm0wS3pTaEdQeHQ1QQ=="} @@ -201,7 +201,7 @@ def test_get_records_with_set(es_app,db, users): browsing_role="3,-99" ) ) - + rec_uuid1 = uuid.uuid4() rec_data1 = {"title":["test_item1"], "path":["123"], @@ -212,7 +212,7 @@ def test_get_records_with_set(es_app,db, users): "_updated": "2022-01-01T00:00:00" } rec1 = RecordMetadata(id=rec_uuid1,json=rec_data1) - + rec_uuid2 = uuid.uuid4() rec_data2 = {"title":["test_item2"], "path":["456"], @@ -223,7 +223,7 @@ def test_get_records_with_set(es_app,db, users): "_updated": "2022-01-01T00:00:00" } rec2 = RecordMetadata(id=rec_uuid2,json=rec_data2) - + rec_uuid3 = uuid.uuid4() rec_data3 = {"title":["test_item3"], "path":["789"], @@ -234,13 +234,13 @@ def test_get_records_with_set(es_app,db, users): "_updated": "2022-01-01T00:00:00" } rec3 = RecordMetadata(id=rec_uuid3,json=rec_data3) - + db.session.add_all(indexes) db.session.add(rec1) db.session.add(rec2) db.session.add(rec3) db.session.commit() - + es_info = dict(index=current_app.config['INDEXER_DEFAULT_INDEX'], doc_type=current_app.config['INDEXER_DEFAULT_DOCTYPE'], version=1, @@ -252,14 +252,14 @@ def test_get_records_with_set(es_app,db, users): current_search_client.index(**es_info,**body1) current_search_client.index(**es_info,**body2) current_search_client.index(**es_info,**body3) - + comm1 = Community.create(community_id="test_comm", role_id=users[0]["id"], id_user=users[0]["id"], title="test community", description="this is test community", root_node_id=indexes[0].id) db.session.add(comm1) db.session.commit() - + data = {"set":"123"} result = get_records(**data) assert result.total == 3 @@ -267,20 +267,20 @@ def test_get_records_with_set(es_app,db, users): assert result_items[0]["json"]["_source"] == rec_data1 assert result_items[1]["json"]["_source"] == rec_data2 assert result_items[2]["json"]["_source"] == rec_data3 - + data = {"set":"123:456"} result = get_records(**data) assert result.total == 2 result_items = [r for r in result.items] assert result_items[0]["json"]["_source"] == rec_data2 assert result_items[1]["json"]["_source"] == rec_data3 - + data = {"set":"123:456:789"} result = get_records(**data) assert result.total == 1 result_items = [r for r in result.items] assert result_items[0]["json"]["_source"] == rec_data3 - + data = {"set":"user-test_comm"} result = get_records(**data) assert result.total == 3 @@ -288,7 +288,7 @@ def test_get_records_with_set(es_app,db, users): assert result_items[0]["json"]["_source"] == rec_data1 assert result_items[1]["json"]["_source"] == rec_data2 assert result_items[2]["json"]["_source"] == rec_data3 - + data = {"set":"test_comm"} result = get_records(**data) assert result.total == 3 @@ -296,11 +296,167 @@ def test_get_records_with_set(es_app,db, users): assert result_items[0]["json"]["_source"] == rec_data1 assert result_items[1]["json"]["_source"] == rec_data2 assert result_items[2]["json"]["_source"] == rec_data3 - + data = {"set":"999"} result = get_records(**data) assert result.total == 0 - + data = {"set":"aaa"} result = get_records(**data) assert result.total == 0 + +# .tox/c1/bin/pytest --cov=invenio_oaiserver tests/test_query.py::test_range_query -vv -s --cov-branch --cov-report=term --basetemp=/code/modules/invenio-oaiserver/.tox/c1/tmp +def test_range_query(): + # Case: _from is datetime + from datetime import datetime + _from = datetime(2026, 1, 1, 12, 0, 0) + result = range_query(_from, None) + assert result is not None + d = result.to_dict() + should2 = d['bool']['should'][1]['bool']['must'] + assert any('gte' in str(x) for x in should2) + + # Case: _until is datetime + _until = datetime(2026, 12, 31, 23, 59, 59) + result = range_query(None, _until) + assert result is not None + d = result.to_dict() + should2 = d['bool']['should'][1]['bool']['must'] + assert any('lte' in str(x) for x in should2) + + # Case: _from is invalid type (int) + _from = 123456 + result = range_query(_from, None) + assert result is None + + # Case: _until is invalid type (int) + _until = 123456 + result = range_query(None, _until) + assert result is None + + # Case: _from is short string (invalid) + _from = '2026-01' + result = range_query(_from, None) + assert result is None + + # Case: _until is short string (invalid) + _until = '2026-12' + result = range_query(None, _until) + assert result is None + + # Case: both _from and _until are None + result = range_query(None, None) + assert result is None + + # Case: only _from is specified + _from = '2026-01-01' + result = range_query(_from, None) + assert result is not None + d = result.to_dict() + # Check that 'gte' appears in should2 (from_should is active) + should2 = d['bool']['should'][1]['bool']['must'] + assert any('gte' in str(x) for x in should2) + + # Case: only _until is specified + _until = '2026-12-31' + result = range_query(None, _until) + assert result is not None + d = result.to_dict() + # Check that 'lte' appears in should2 (until_must is active) + should2 = d['bool']['should'][1]['bool']['must'] + assert any('lte' in str(x) for x in should2) + + # Case: both _from and _until are specified + _from = '2026-01-01' + _until = '2026-12-31' + result = range_query(_from, _until) + assert result is not None + d = result.to_dict() + should2 = d['bool']['should'][1]['bool']['must'] + # Both from_should and until_must should be active + assert any('gte' in str(x) for x in should2) + assert any('lte' in str(x) for x in should2) + +@pytest.mark.parametrize("fix_access, from_, until, expect_range, expect_rq, rangequery_none", [ + (False, None, None, False, False, False), + (False, "2026-01-01", None, True, False, False), + (False, None, "2026-12-31", True, False, False), + (False, "2026-01-01", "2026-12-31", True, False, False), + (True, None, None, False, False, False), + (True, "2026-01-01", None, True, True, False), + (True, None, "2026-12-31", True, True, False), + (True, "2026-01-01", "2026-12-31", True, True, False), + (True, "2026-01-01", "2026-12-31", False, True, True), +]) +# .tox/c1/bin/pytest --cov=invenio_oaiserver tests/test_query.py::test_get_records_range_branch -v -s -vv --cov-branch --cov-report=term --cov-config=tox.ini --basetemp=/code/modules/invenio-oaiserver/.tox/c1/tmp +def test_get_records_range_branch(es_app, db, monkeypatch, fix_access, from_, until, expect_range, expect_rq, rangequery_none): + es_app.config['WEKO_SEARCH_FIX_ACCESSRIGHTS'] = fix_access + + index = Index( + id=30, + parent=0, + position=1, + index_name_english="range_index", + index_link_name_english="range_index_link", + harvest_public_state=True, + public_state=True, + public_date=datetime(2100,1,1), + browsing_role="3,-99" + ) + db.session.add(index) + rec_uuid = uuid.uuid4() + PersistentIdentifier.create('doi', "https://doi.org/00030", object_type='rec', object_uuid=rec_uuid, status=PIDStatus.REGISTERED) + rec_data = { + "title": ["range_item"], + "path": ["30"], + "_oai": {"id": "oai:test:00030", "sets": ["30"]}, + "set": ["30"], + "relation_version_is_last": "true", + "control_number": "30", + "publish_status": "0", + "_updated": "2100-01-01T00:00:00" + } + rec = RecordMetadata(id=rec_uuid, json=rec_data) + db.session.add(rec) + db.session.commit() + es_info = dict( + id=str(rec_uuid), + index=es_app.config['INDEXER_DEFAULT_INDEX'], + doc_type=es_app.config['INDEXER_DEFAULT_DOCTYPE'], + refresh="wait_for" + ) + body = dict(version=1, version_type="external_gte", body=rec_data) + from invenio_search import current_search_client + current_search_client.index(**{**es_info, **body}) + current_search_client.indices.refresh(index=es_app.config['INDEXER_DEFAULT_INDEX']) + + called = {"filter": False, "rq": False} + import invenio_oaiserver.query as query_mod + + orig_filter = query_mod.OAIServerSearch.filter + def filter_spy(self, *args, **kwargs): + called["filter"] = True + return orig_filter(self, *args, **kwargs) + monkeypatch.setattr(query_mod.OAIServerSearch, "filter", filter_spy) + + orig_rq = query_mod.range_query + if rangequery_none: + def rq_spy(_from, _until): + called["rq"] = True + return None + monkeypatch.setattr(query_mod, "range_query", rq_spy) + else: + def rq_spy(_from, _until): + called["rq"] = True + return orig_rq(_from, _until) + monkeypatch.setattr(query_mod, "range_query", rq_spy) + + with es_app.app_context(): + kwargs = {"set": "30"} + if from_: + kwargs["from_"] = from_ + if until: + kwargs["until"] = until + get_records(**kwargs) + assert called["filter"] == expect_range + assert called["rq"] == expect_rq diff --git a/modules/invenio-oauth2server/invenio_oauth2server/templates/invenio_oauth2server/authorize.html b/modules/invenio-oauth2server/invenio_oauth2server/templates/invenio_oauth2server/authorize.html index 921dc581b7..b4e90f95a9 100644 --- a/modules/invenio-oauth2server/invenio_oauth2server/templates/invenio_oauth2server/authorize.html +++ b/modules/invenio-oauth2server/invenio_oauth2server/templates/invenio_oauth2server/authorize.html @@ -3,8 +3,8 @@ This file is part of Invenio. Copyright (C) 2015-2018 CERN. - Invenio is free software; you can redistribute it and/or modify it - under the terms of the MIT License; see LICENSE file for more details. +Invenio is free software; you can redistribute it and/or modify it +under the terms of the MIT License; see LICENSE file for more details. #} {%- extends config.OAUTH2SERVER_COVER_TEMPLATE %} @@ -13,54 +13,64 @@ {% block page_body %}
-
-
-{{ helpers.panel_start(_('Authorize application'), icon='fa fa-shield fa-fw') }} -

{{ _('Authorize application') }}

-

{{ _("Application '%(client_name)s' by '%(client_user)s' wants permission to access your '%(current_user)s' account.", - client_name=client.name, client_user=client.user.nickname or client.user.email, current_user=current_user.nickname or current_user.email) }}

-
-
-
-
+
+
+ {{ helpers.panel_start(_('Authorize application'), icon='fa fa-shield fa-fw') }} +

{{ _('Authorize application') }}

+

{{ _("Application '%(client_name)s' by '%(client_user)s' wants permission to access your + '%(current_user)s' account.", + client_name=client.name, client_user=client.user.nickname or client.user.email, + current_user=current_user.nickname or current_user.email) }}

+
+
+
+
-

{{ _('Review permissions') }}

- {%- for group in scopes|groupby('group') %} - {%- if loop.first %}{% endif %} - - - - - {%- if loop.last %}
{{group.grouper}}
    {% for scope in group.list %}
  • {{scope.help_text}}
    • {% endfor %}
{% endif %} - {%- else %} -

No permissions granted.

- {%- endfor %} -
-
-
-
-
- {{ _('Application') }} -

{{client.name}}

- {%- if client.description %}

{{client.description}}

{% endif %} - {%- if client.website %}

{{ _('Visit application website') }}

{% endif %} -
-

- {{ client.get_users }} {{ 'user' if client.get_users == 1 else 'users' }} -

+

{{ _('Review permissions') }}

+ {%- for group in scopes|groupby('group') %} + {%- if loop.first %} + {% endif %} + + + + + {%- if loop.last %} + +
{{group.grouper}} +
    {% for scope in group.list %}
  • {{scope.help_text}}
    • {% endfor %}
+
{% endif %} + {%- else %} +

{{ _("No permissions granted.") }}

+ {%- endfor %} +
+
+
+
+
+ {{ _('Application') }} +

{{client.name}}

+ {%- if client.description %}

{{client.description}}

{% endif %} + {%- if client.website %}

{{ _("Visit application website") }}

{% + endif %} +
+

+ {{ client.get_users }} {{ 'user' if client.get_users == 1 else 'users' }} +

+
+
+
+
+
+
+
+ + +
+
+ {{ helpers.panel_end() }} +
-
-
-
-
-
-
- - -
-
-{{ helpers.panel_end() }} -
-
{% endblock %} diff --git a/modules/invenio-oauth2server/invenio_oauth2server/templates/invenio_oauth2server/errors.html b/modules/invenio-oauth2server/invenio_oauth2server/templates/invenio_oauth2server/errors.html index 13cea2a2d6..d2380e73ad 100644 --- a/modules/invenio-oauth2server/invenio_oauth2server/templates/invenio_oauth2server/errors.html +++ b/modules/invenio-oauth2server/invenio_oauth2server/templates/invenio_oauth2server/errors.html @@ -3,8 +3,8 @@ This file is part of Invenio. Copyright (C) 2015-2018 CERN. - Invenio is free software; you can redistribute it and/or modify it - under the terms of the MIT License; see LICENSE file for more details. +Invenio is free software; you can redistribute it and/or modify it +under the terms of the MIT License; see LICENSE file for more details. #} {%- extends config.OAUTH2SERVER_COVER_TEMPLATE %} @@ -14,24 +14,36 @@ {%- block page_body %}
- {{ helpers.panel_start( + {{ helpers.panel_start( _('Invalid authorization request'), icon='fa fa-warning fa-fw' - ) }} - - {{ _('Invalid authorization request') }} - - {{ _('The service that redirected your here made an invalid authorization request (error code: %(x_error)s).', - x_error=error.error) }} - -
-
-
- - {{ _('Get me out of here!') }} - + ) }} + +

+ {{ _('You cannot access the service because there is an error in the authentication request.') }} + {% if error.error == unsupported_response_type %} + ({{ _('unsupported_response_type') }}) + {% elif error.error == 'invalid_request' %} + {% if error.description is string and 'client_id' in error.description %} + ({{ _('invalid_client_id') }}) + {% else %} + ({{ _('invalid_request') }}) + {% endif %} + {% elif error.error == 'invalid_scope' %} + ({{ _('invalid_scope')}}) + {% elif error.error == 'access_denied' %} + ({{ _('access_denied') }}) + {% endif %} +

+ +
+
+ + {{ helpers.panel_end() }}
- {{ helpers.panel_end() }}
-
-{%- endblock %} + {%- endblock %} diff --git a/modules/invenio-oauth2server/invenio_oauth2server/translations/en/LC_MESSAGES/messages.mo b/modules/invenio-oauth2server/invenio_oauth2server/translations/en/LC_MESSAGES/messages.mo index 37cc8629ab..ddda3415eb 100644 Binary files a/modules/invenio-oauth2server/invenio_oauth2server/translations/en/LC_MESSAGES/messages.mo and b/modules/invenio-oauth2server/invenio_oauth2server/translations/en/LC_MESSAGES/messages.mo differ diff --git a/modules/invenio-oauth2server/invenio_oauth2server/translations/en/LC_MESSAGES/messages.po b/modules/invenio-oauth2server/invenio_oauth2server/translations/en/LC_MESSAGES/messages.po index 0906c42036..bd5a324cfb 100644 --- a/modules/invenio-oauth2server/invenio_oauth2server/translations/en/LC_MESSAGES/messages.po +++ b/modules/invenio-oauth2server/invenio_oauth2server/translations/en/LC_MESSAGES/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: invenio-oauth2server 1.0.0\n" "Report-Msgid-Bugs-To: info@inveniosoftware.org\n" -"POT-Creation-Date: 2025-10-03 14:53+0900\n" +"POT-Creation-Date: 2025-12-17 12:38+0900\n" "PO-Revision-Date: 2025-05-07 18:18+0900\n" "Last-Translator: FULL NAME \n" "Language: en\n" @@ -112,8 +112,8 @@ msgstr "" #: invenio_oauth2server/templates/invenio_oauth2server/authorize.html:18 #: invenio_oauth2server/templates/invenio_oauth2server/authorize.html:19 -#: invenio_oauth2server/templates/invenio_oauth2server/authorize.html:58 -#: invenio_oauth2server/views/server.py:69 +#: invenio_oauth2server/templates/invenio_oauth2server/authorize.html:67 +#: invenio_oauth2server/views/server.py:71 msgid "Authorize application" msgstr "" @@ -121,41 +121,64 @@ msgstr "" #, python-format msgid "" "Application '%(client_name)s' by '%(client_user)s' wants permission to " -"access your '%(current_user)s' account." +"access your\n" +" '%(current_user)s' account." msgstr "" -#: invenio_oauth2server/templates/invenio_oauth2server/authorize.html:27 +#: invenio_oauth2server/templates/invenio_oauth2server/authorize.html:29 #: invenio_oauth2server/templates/invenio_oauth2server/settings/token_permission_view.html:29 msgid "Review permissions" msgstr "" #: invenio_oauth2server/templates/invenio_oauth2server/authorize.html:43 +msgid "No permissions granted." +msgstr "" + +#: invenio_oauth2server/templates/invenio_oauth2server/authorize.html:50 #: invenio_oauth2server/templates/invenio_oauth2server/settings/token_permission_view.html:43 msgid "Application" msgstr "" -#: invenio_oauth2server/templates/invenio_oauth2server/authorize.html:46 +#: invenio_oauth2server/templates/invenio_oauth2server/authorize.html:53 #: invenio_oauth2server/templates/invenio_oauth2server/settings/token_permission_view.html:46 msgid "Visit application website" msgstr "" -#: invenio_oauth2server/templates/invenio_oauth2server/authorize.html:59 +#: invenio_oauth2server/templates/invenio_oauth2server/authorize.html:69 msgid "Reject" msgstr "" #: invenio_oauth2server/templates/invenio_oauth2server/errors.html:18 -#: invenio_oauth2server/templates/invenio_oauth2server/errors.html:22 msgid "Invalid authorization request" msgstr "" -#: invenio_oauth2server/templates/invenio_oauth2server/errors.html:24 -#, python-format +#: invenio_oauth2server/templates/invenio_oauth2server/errors.html:23 msgid "" -"The service that redirected your here made an invalid authorization " -"request (error code: %(x_error)s)." +"You cannot access the service because there is an error in the " +"authentication request." msgstr "" -#: invenio_oauth2server/templates/invenio_oauth2server/errors.html:31 +#: invenio_oauth2server/templates/invenio_oauth2server/errors.html:25 +msgid "unsupported_response_type" +msgstr "error: This response type is not supported." + +#: invenio_oauth2server/templates/invenio_oauth2server/errors.html:28 +msgid "invalid_client_id" +msgstr "error: The client ID is incorrect." + +#: invenio_oauth2server/templates/invenio_oauth2server/errors.html:30 +msgid "invalid_request" +msgstr "error: The request is invalid." + +#: invenio_oauth2server/templates/invenio_oauth2server/errors.html:33 +msgid "invalid_scope" +msgstr "error: The scope is incorrect." + +#: invenio_oauth2server/templates/invenio_oauth2server/errors.html:35 +msgid "access_denied" +msgstr "error: Access has been denied." + +#: invenio_oauth2server/templates/invenio_oauth2server/errors.html:43 msgid "Get me out of here!" msgstr "" diff --git a/modules/invenio-oauth2server/invenio_oauth2server/translations/ja/LC_MESSAGES/messages.mo b/modules/invenio-oauth2server/invenio_oauth2server/translations/ja/LC_MESSAGES/messages.mo index d9eceed768..29454e17ea 100644 Binary files a/modules/invenio-oauth2server/invenio_oauth2server/translations/ja/LC_MESSAGES/messages.mo and b/modules/invenio-oauth2server/invenio_oauth2server/translations/ja/LC_MESSAGES/messages.mo differ diff --git a/modules/invenio-oauth2server/invenio_oauth2server/translations/ja/LC_MESSAGES/messages.po b/modules/invenio-oauth2server/invenio_oauth2server/translations/ja/LC_MESSAGES/messages.po index 2e6ae3943b..a5c11db316 100644 --- a/modules/invenio-oauth2server/invenio_oauth2server/translations/ja/LC_MESSAGES/messages.po +++ b/modules/invenio-oauth2server/invenio_oauth2server/translations/ja/LC_MESSAGES/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: invenio-oauth2server 1.0.0\n" "Report-Msgid-Bugs-To: info@inveniosoftware.org\n" -"POT-Creation-Date: 2025-10-03 14:53+0900\n" +"POT-Creation-Date: 2025-12-17 12:38+0900\n" "PO-Revision-Date: 2025-05-07 18:18+0900\n" "Last-Translator: FULL NAME \n" "Language: ja\n" @@ -112,50 +112,73 @@ msgstr "" #: invenio_oauth2server/templates/invenio_oauth2server/authorize.html:18 #: invenio_oauth2server/templates/invenio_oauth2server/authorize.html:19 -#: invenio_oauth2server/templates/invenio_oauth2server/authorize.html:58 -#: invenio_oauth2server/views/server.py:69 +#: invenio_oauth2server/templates/invenio_oauth2server/authorize.html:67 +#: invenio_oauth2server/views/server.py:71 msgid "Authorize application" -msgstr "" +msgstr "アプリの使用を承諾する" #: invenio_oauth2server/templates/invenio_oauth2server/authorize.html:20 #, python-format msgid "" "Application '%(client_name)s' by '%(client_user)s' wants permission to " -"access your '%(current_user)s' account." -msgstr "" +"access your\n" +" '%(current_user)s' account." +msgstr "「%(client_user)s」による「%(client_name)s」アプリケーションがあなたのアカウントへのアクセス許可を求めています。" -#: invenio_oauth2server/templates/invenio_oauth2server/authorize.html:27 +#: invenio_oauth2server/templates/invenio_oauth2server/authorize.html:29 #: invenio_oauth2server/templates/invenio_oauth2server/settings/token_permission_view.html:29 msgid "Review permissions" -msgstr "" +msgstr "権限を確認" #: invenio_oauth2server/templates/invenio_oauth2server/authorize.html:43 +msgid "No permissions granted." +msgstr "権限が付与されていません。" + +#: invenio_oauth2server/templates/invenio_oauth2server/authorize.html:50 #: invenio_oauth2server/templates/invenio_oauth2server/settings/token_permission_view.html:43 msgid "Application" -msgstr "" +msgstr "アプリケーション" -#: invenio_oauth2server/templates/invenio_oauth2server/authorize.html:46 +#: invenio_oauth2server/templates/invenio_oauth2server/authorize.html:53 #: invenio_oauth2server/templates/invenio_oauth2server/settings/token_permission_view.html:46 msgid "Visit application website" -msgstr "" +msgstr "アプリケーションのウェブサイト閲覧" -#: invenio_oauth2server/templates/invenio_oauth2server/authorize.html:59 +#: invenio_oauth2server/templates/invenio_oauth2server/authorize.html:69 msgid "Reject" -msgstr "" +msgstr "拒否" #: invenio_oauth2server/templates/invenio_oauth2server/errors.html:18 -#: invenio_oauth2server/templates/invenio_oauth2server/errors.html:22 msgid "Invalid authorization request" -msgstr "" +msgstr "無効な認証リクエスト" -#: invenio_oauth2server/templates/invenio_oauth2server/errors.html:24 -#, python-format +#: invenio_oauth2server/templates/invenio_oauth2server/errors.html:23 msgid "" -"The service that redirected your here made an invalid authorization " -"request (error code: %(x_error)s)." -msgstr "" +"You cannot access the service because there is an error in the " +"authentication request." +msgstr "認証リクエストに誤りがあるため、アクセスできません。" + +#: invenio_oauth2server/templates/invenio_oauth2server/errors.html:25 +msgid "unsupported_response_type" +msgstr "エラー: このレスポンスタイプはサポートされていません。" + +#: invenio_oauth2server/templates/invenio_oauth2server/errors.html:28 +msgid "invalid_client_id" +msgstr "エラー: クライアントIDに誤りがあります。" + +#: invenio_oauth2server/templates/invenio_oauth2server/errors.html:30 +msgid "invalid_request" +msgstr "エラー: 無効なリクエストです。" + +#: invenio_oauth2server/templates/invenio_oauth2server/errors.html:33 +msgid "invalid_scope" +msgstr "エラー: スコープに誤りがあります。" + +#: invenio_oauth2server/templates/invenio_oauth2server/errors.html:35 +msgid "access_denied" +msgstr "エラー: アクセスが拒否されました。" -#: invenio_oauth2server/templates/invenio_oauth2server/errors.html:31 +#: invenio_oauth2server/templates/invenio_oauth2server/errors.html:43 msgid "Get me out of here!" msgstr "" diff --git a/modules/invenio-oauth2server/invenio_oauth2server/translations/messages.pot b/modules/invenio-oauth2server/invenio_oauth2server/translations/messages.pot index 92fb442353..2a2a8546ab 100644 --- a/modules/invenio-oauth2server/invenio_oauth2server/translations/messages.pot +++ b/modules/invenio-oauth2server/invenio_oauth2server/translations/messages.pot @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: invenio-oauth2server 1.0.0\n" "Report-Msgid-Bugs-To: info@inveniosoftware.org\n" -"POT-Creation-Date: 2025-10-03 14:53+0900\n" +"POT-Creation-Date: 2025-12-17 12:38+0900\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -111,8 +111,8 @@ msgstr "" #: invenio_oauth2server/templates/invenio_oauth2server/authorize.html:18 #: invenio_oauth2server/templates/invenio_oauth2server/authorize.html:19 -#: invenio_oauth2server/templates/invenio_oauth2server/authorize.html:58 -#: invenio_oauth2server/views/server.py:69 +#: invenio_oauth2server/templates/invenio_oauth2server/authorize.html:67 +#: invenio_oauth2server/views/server.py:71 msgid "Authorize application" msgstr "" @@ -120,41 +120,64 @@ msgstr "" #, python-format msgid "" "Application '%(client_name)s' by '%(client_user)s' wants permission to " -"access your '%(current_user)s' account." +"access your\n" +" '%(current_user)s' account." msgstr "" -#: invenio_oauth2server/templates/invenio_oauth2server/authorize.html:27 +#: invenio_oauth2server/templates/invenio_oauth2server/authorize.html:29 #: invenio_oauth2server/templates/invenio_oauth2server/settings/token_permission_view.html:29 msgid "Review permissions" msgstr "" #: invenio_oauth2server/templates/invenio_oauth2server/authorize.html:43 +msgid "No permissions granted." +msgstr "" + +#: invenio_oauth2server/templates/invenio_oauth2server/authorize.html:50 #: invenio_oauth2server/templates/invenio_oauth2server/settings/token_permission_view.html:43 msgid "Application" msgstr "" -#: invenio_oauth2server/templates/invenio_oauth2server/authorize.html:46 +#: invenio_oauth2server/templates/invenio_oauth2server/authorize.html:53 #: invenio_oauth2server/templates/invenio_oauth2server/settings/token_permission_view.html:46 msgid "Visit application website" msgstr "" -#: invenio_oauth2server/templates/invenio_oauth2server/authorize.html:59 +#: invenio_oauth2server/templates/invenio_oauth2server/authorize.html:69 msgid "Reject" msgstr "" #: invenio_oauth2server/templates/invenio_oauth2server/errors.html:18 -#: invenio_oauth2server/templates/invenio_oauth2server/errors.html:22 msgid "Invalid authorization request" msgstr "" -#: invenio_oauth2server/templates/invenio_oauth2server/errors.html:24 -#, python-format +#: invenio_oauth2server/templates/invenio_oauth2server/errors.html:23 msgid "" -"The service that redirected your here made an invalid authorization " -"request (error code: %(x_error)s)." +"You cannot access the service because there is an error in the " +"authentication request." +msgstr "" + +#: invenio_oauth2server/templates/invenio_oauth2server/errors.html:25 +msgid "unsupported_response_type" +msgstr "" + +#: invenio_oauth2server/templates/invenio_oauth2server/errors.html:28 +msgid "invalid_client_id" +msgstr "" + +#: invenio_oauth2server/templates/invenio_oauth2server/errors.html:30 +msgid "invalid_request" +msgstr "" + +#: invenio_oauth2server/templates/invenio_oauth2server/errors.html:33 +msgid "invalid_scope" +msgstr "" + +#: invenio_oauth2server/templates/invenio_oauth2server/errors.html:35 +msgid "access_denied" msgstr "" -#: invenio_oauth2server/templates/invenio_oauth2server/errors.html:31 +#: invenio_oauth2server/templates/invenio_oauth2server/errors.html:43 msgid "Get me out of here!" msgstr "" diff --git a/modules/invenio-oauth2server/invenio_oauth2server/views/server.py b/modules/invenio-oauth2server/invenio_oauth2server/views/server.py index 5e59143bb1..066c560b68 100644 --- a/modules/invenio-oauth2server/invenio_oauth2server/views/server.py +++ b/modules/invenio-oauth2server/invenio_oauth2server/views/server.py @@ -13,12 +13,14 @@ from functools import wraps from flask import Blueprint, _request_ctx_stack, abort, current_app, jsonify, \ - redirect, render_template, request, session + redirect, render_template, request, make_response from flask_babelex import lazy_gettext as _ from flask_breadcrumbs import register_breadcrumb from flask_login import login_required from flask_principal import Identity, identity_changed -from oauthlib.oauth2.rfc6749.errors import InvalidClientError, OAuth2Error +from oauthlib.oauth2.rfc6749.errors import InvalidClientError, OAuth2Error, \ + AccessDeniedError, raise_from_error + from invenio_db import db from ..models import Client @@ -81,10 +83,14 @@ def authorize(*args, **kwargs): abort(404) scopes = current_oauth2server.scopes + scopes_list = [scopes[x] for x in kwargs.get('scopes', [])] + if not scopes_list: + return redirect('/oauth/errors?error=invalid_scope') + ctx = dict( client=client, oauth_request=kwargs.get('request'), - scopes=[scopes[x] for x in kwargs.get('scopes', [])], + scopes=scopes_list ) return render_template('invenio_oauth2server/authorize.html', **ctx) @@ -120,14 +126,22 @@ def access_token(): @blueprint.route('/errors') def errors(): """Error view in case of invalid oauth requests.""" - from oauthlib.oauth2.rfc6749.errors import raise_from_error + status_code = 200 try: error = None - raise_from_error(request.values.get('error'), params=dict()) + error_code = request.values.get('error') + description = request.values.get('error_description') + params = {} + if description: + params['error_description'] = description + + raise_from_error(error_code, params=params) except OAuth2Error as raised: error = raised - return render_template('invenio_oauth2server/errors.html', error=error) - + if not isinstance(error, AccessDeniedError): + status_code = 400 + response = make_response(render_template('invenio_oauth2server/errors.html', error=error), status_code) + return response @blueprint.route('/ping', methods=['GET', 'POST']) @oauth2.require_oauth() @@ -163,10 +177,11 @@ def invalid(): @blueprint.teardown_request def dbsession_clean(exception): + """Clean up the database session after each request.""" current_app.logger.debug("invenio_oauth2server dbsession_clean: {}".format(exception)) if exception is None: try: db.session.commit() except: db.session.rollback() - db.session.remove() \ No newline at end of file + db.session.remove() diff --git a/modules/invenio-oauth2server/tests/conftest.py b/modules/invenio-oauth2server/tests/conftest.py index 05e8fd0860..b7f35001ae 100644 --- a/modules/invenio-oauth2server/tests/conftest.py +++ b/modules/invenio-oauth2server/tests/conftest.py @@ -314,10 +314,20 @@ def provider_fixture(app): 'oauth2test.authorized', _external=True ), _default_scopes='email') + c5 = Client(client_id='no-scopes', + client_secret='no-scopes', + name='no-scopes', + description='', + is_confidential=False, + user=user1, + _redirect_uris=url_for( + 'oauth2test.authorized', _external=True + )) db.session.add(c1) db.session.add(c2) db.session.add(c3) db.session.add(c4) + db.session.add(c5) personal_token = Token.create_personal('test-personal', user1.id, scopes=[], diff --git a/modules/invenio-oauth2server/tests/test_provider.py b/modules/invenio-oauth2server/tests/test_provider.py index ab4963ffab..117d524668 100644 --- a/modules/invenio-oauth2server/tests/test_provider.py +++ b/modules/invenio-oauth2server/tests/test_provider.py @@ -136,7 +136,7 @@ def test_invalid_authorize_requests(provider_fixture): assert error_url in next_url r = client.get(next_url, query_string=data) - assert 'invalid_request' in str(r.data) + assert 'an error in the authentication request' in str(r.data) # Invalid redirect uri r = client.get(url_for( @@ -151,6 +151,27 @@ def test_invalid_authorize_requests(provider_fixture): assert data['error'] == 'invalid_request' assert error_url in next_url + for client_id in ['no-scopes']: + response_type = 'code' + error_url = url_for('invenio_oauth2server.errors', + _external=True) + # Missing scope + r = client.get( + url_for('invenio_oauth2server.authorize'), + data={ + 'redirect_uri': redirect_uri, + 'response_type': response_type, + 'client_id': client_id, + }) + next_url, data = parse_redirect(r.location) + assert r.status_code == 302 + assert data['error'] == 'invalid_scope' + assert url_for('invenio_oauth2server.errors') in next_url + + r = client.get( + url_for('invenio_oauth2server.errors')) + assert r.status_code == 400 + def test_refresh_flow(provider_fixture): app = provider_fixture diff --git a/modules/invenio-records-rest/invenio_records_rest/facets.py b/modules/invenio-records-rest/invenio_records_rest/facets.py index 280c8f7321..5d30f92e17 100644 --- a/modules/invenio-records-rest/invenio_records_rest/facets.py +++ b/modules/invenio-records-rest/invenio_records_rest/facets.py @@ -94,13 +94,23 @@ def inner(values): def _create_filter_dsl(urlkwargs, definitions): """Create a filter DSL expression.""" filters = [] + weko_search_fix_accessrights = current_app.config.get("WEKO_SEARCH_FIX_ACCESSRIGHTS", False) for name, filter_factory in definitions.items(): values = request.values.getlist(name, type=text_type) if values: - filters.append(filter_factory(values)) - for v in values: - urlkwargs.add(name, v) - + if name in ("Access", "accessRights") and "new_accessRights" in definitions and weko_search_fix_accessrights: + new_accessrights_filters = definitions["new_accessRights"]["filters"]["filters"] + access_rights_queries = [] + for v in values: + if v in new_accessrights_filters: + access_rights_queries.append(Q(new_accessrights_filters[v])) + urlkwargs.add(name, v) + if access_rights_queries: + filters.append(Q('bool', should=access_rights_queries)) + else: + filters.append(filter_factory(values)) + for v in values: + urlkwargs.add(name, v) return (filters, urlkwargs) @@ -139,7 +149,7 @@ def default_facets_factory(search, index): all fields and values used. """ urlkwargs = MultiDict() - + from weko_admin.utils import get_facet_search_query from weko_search_ui.permissions import search_permission facets = get_facet_search_query(search_permission.can()).get(index) diff --git a/modules/invenio-records-rest/invenio_records_rest/views.py b/modules/invenio-records-rest/invenio_records_rest/views.py index fff588810d..dd073f60a4 100644 --- a/modules/invenio-records-rest/invenio_records_rest/views.py +++ b/modules/invenio-records-rest/invenio_records_rest/views.py @@ -853,8 +853,9 @@ def url_args_check(): if size * page < search_result.hits.total and \ size * page < self.max_result_window: links['next'] = url_for(endpoint, page=page + 1, **urlkwargs) - from weko_search_ui.utils import combine_aggs + from weko_search_ui.utils import combine_aggs, fix_aggregations_accessrights search_result = combine_aggs(search_result.to_dict()) + search_result = fix_aggregations_accessrights(search_result) return self.make_response( pid_fetcher=self.pid_fetcher, search_result=search_result, diff --git a/modules/invenio-records-rest/tests/test_facets.py b/modules/invenio-records-rest/tests/test_facets.py index 27f25a5716..bc2843e33a 100644 --- a/modules/invenio-records-rest/tests/test_facets.py +++ b/modules/invenio-records-rest/tests/test_facets.py @@ -85,6 +85,58 @@ def test_create_filter_dsl(): assert not filters assert args == kwargs +def test_create_filter_dsl_accessrights(): + app = Flask('testapp') + app.config['WEKO_SEARCH_FIX_ACCESSRIGHTS'] = True + # Definition of new_accessRights + definitions = { + "accessRights": lambda values: Q('terms', accessRights=values), + "new_accessRights": { + "filters": { + "filters": { + "open": {"term": {"accessRights": "open"}}, + "closed": {"term": {"accessRights": "closed"}}, + } + } + } + } + # Values included in new_accessrights_filters + with app.test_request_context('?accessRights=open&accessRights=closed'): + kwargs = MultiDict() + filters, args = _create_filter_dsl(kwargs, definitions) + assert len(filters) == 1 + assert filters[0].to_dict() == { + "bool": { + "should": [ + {"term": {"accessRights": "open"}}, + {"term": {"accessRights": "closed"}} + ] + } + } + assert args.getlist('accessRights') == ['open', 'closed'] + + # Values not included in new_accessrights_filters + with app.test_request_context('?accessRights=unknown'): + kwargs = MultiDict() + filters, args = _create_filter_dsl(kwargs, definitions) + assert filters == [] + assert args.getlist('accessRights') == [] + + # When the request value is empty + with app.test_request_context(''): + kwargs = MultiDict() + filters, args = _create_filter_dsl(kwargs, definitions) + assert filters == [] + assert args == kwargs + + definitions = { + "other": lambda values: Q('terms', other=values), + } + with app.test_request_context('?other=open'): + kwargs = MultiDict() + filters, args = _create_filter_dsl(kwargs, definitions) + assert filters == [Q('terms', other=['open'])] + assert args.getlist('other') == ['open'] def test_post_filter(app): """Test post filter.""" @@ -242,4 +294,4 @@ def test_default_facets_factory(app, db, search_user, redis_connect): assert 'aggs' not in search.to_dict() assert 'post_filter' not in search.to_dict() assert 'bool' not in search.to_dict()['query'] - redis_connect.delete(test_redis_key) \ No newline at end of file + redis_connect.delete(test_redis_key) diff --git a/modules/invenio-records/invenio_records/api.py b/modules/invenio-records/invenio_records/api.py index 96d6a3ec8d..d73f5fac3a 100644 --- a/modules/invenio-records/invenio_records/api.py +++ b/modules/invenio-records/invenio_records/api.py @@ -17,6 +17,7 @@ from jsonpatch import apply_patch from sqlalchemy.orm.attributes import flag_modified from werkzeug.local import LocalProxy +from datetime import datetime, time from .errors import MissingModelError from .models import RecordMetadata @@ -214,10 +215,11 @@ def __custom_record_metadata(cls, record_metadata: dict): Args: record_metadata (dict): Record metadata. """ - from weko_records.utils import replace_fqdn_of_file_metadata + from weko_records.utils import replace_fqdn_of_file_metadata, update_embargo_rights for k, v in record_metadata.items(): if isinstance(v, dict) and v.get('attribute_type') == 'file': replace_fqdn_of_file_metadata(v.get("attribute_value_mlt", [])) + update_embargo_rights(record_metadata) @classmethod def get_records(cls, ids, with_deleted=False): @@ -376,7 +378,83 @@ def revisions(self): return RevisionsIterator(self.model) + @property + def updated(self): + if not self.model: + return None + original_updated = self.model.updated + if not current_app.config.get('WEKO_SEARCH_FIX_ACCESSRIGHTS', False): + return original_updated + metadata = db.session.query(RecordMetadata.json).filter_by(id=self.model.id).scalar() + item_type_id = metadata.get("item_type_id") if metadata else None + from weko_records.serializers.utils import get_mapping + mapping = get_mapping(item_type_id, "jpcoar_mapping") if item_type_id else None + access_path = mapping.get("accessRights.@value") if mapping else None + + def _get_nested_value(data, path): + keys = path.split('.') + key = keys[0] + rest = '.'.join(keys[1:]) + if isinstance(data, dict): + if key in data: + if rest: + return _get_nested_value(data[key], rest) + else: + return data[key] + elif 'attribute_value_mlt' in data: + for item in data['attribute_value_mlt']: + found = _get_nested_value(item, '.'.join(keys)) + if found is not None: + return found + return None + else: + return None + elif isinstance(data, list): + for item in data: + found = _get_nested_value(item, '.'.join(keys)) + if found is not None: + return found + return None + else: + return None + + access_rights = ( + _get_nested_value(metadata, access_path) + if metadata and access_path else None + ) + accessrole_date = [] + for v in metadata.values() if metadata else []: + if isinstance(v, dict) and v.get("attribute_type") == "file": + for file_info in v.get("attribute_value_mlt", []): + date_list = file_info.get("date", []) + date_value = date_list[0].get("dateValue") if date_list else None + accessrole = file_info.get("accessrole") + if date_value and accessrole: + date_obj = datetime.strptime(date_value, "%Y-%m-%d").date() + accessrole_date.append((accessrole, date_obj)) + + today = datetime.now().date() + + from weko_records.utils import check_embargo_rights + is_update, change_value = check_embargo_rights( + access_rights, today, accessrole_date + ) + if not (is_update and change_value == "open access"): + return original_updated + + open_dates = [] + for role, date_str in accessrole_date: + dt = datetime.combine(date_str, time(0, 0, 0)) + dt = datetime.combine(dt.date(), time(0, 0, 0)) + open_dates.append(dt) + + latest_open_date = max(open_dates) + if original_updated: + result = max(original_updated, latest_open_date) + return result + else: + return latest_open_date class RecordRevision(RecordBase): """API for record revisions.""" diff --git a/modules/invenio-records/tests/test_api.py b/modules/invenio-records/tests/test_api.py index 0298c35caa..071657de17 100644 --- a/modules/invenio-records/tests/test_api.py +++ b/modules/invenio-records/tests/test_api.py @@ -392,3 +392,299 @@ def test_validate_partial(app, db): record['a'] = 1 with pytest.raises(ValidationError) as exc_info: record.commit(validator=PartialDraft4Validator) + +@pytest.mark.parametrize( + "fix_accessrights, access_path, updated, meta_patch, expected", + [ + # Empty data + (True, None, None, {}, None), + + # Only updated is set + (True, None, datetime(2026, 3, 1, 0, 0, 0), None, datetime(2026, 3, 1, 0, 0, 0)), + + # item_type_id is None + (True, None, datetime(2026, 3, 1, 0, 0, 0), {"item_type_id": None}, datetime(2026, 3, 1, 0, 0, 0)), + + # Only item_type_id is set + (True, None, datetime(2026, 3, 1, 0, 0, 0), {"item_type_id": 1}, datetime(2026, 3, 1, 0, 0, 0)), + + # Empty file attribute + (True, None, datetime(2026, 3, 1, 0, 0, 0), { + "item_type_id": 1, + "item_1736146823660": { + "attribute_name": "アクセス権", + "attribute_value_mlt": [] + } + }, datetime(2026, 3, 1, 0, 0, 0)), + + # Empty file attribute (updated=None) + (True, None, None, {"item_type_id": 1, "item_foo": {"attribute_type": "file", "attribute_value_mlt": []}}, None), + + # open_date is in the future + (True, "item_1736146823660.attribute_value_mlt.subitem_access_right", datetime(2027, 1, 1, 0, 0, 0), { + "item_type_id": 1, + "item_1736146823660": { + "attribute_name": "アクセス権", + "attribute_value_mlt": [ + { + "subitem_access_right": "embargoed access", + "subitem_access_right_uri": "http://purl.org/coar/access_right/c_f1cf" + } + ] + }, + "item_1736148125517": { + "attribute_type": "file", + "attribute_value_mlt": [ + {"date": [{"dateType": "Available", "dateValue": "2026-12-31"}], "accessrole": "open_date"} + ] + } + }, datetime(2027, 1, 1, 0, 0, 0)), + + # open_date is in the past + (True, "item_1736146823660.attribute_value_mlt.subitem_access_right", datetime(2026, 3, 1, 0, 0, 0), { + "item_type_id": 1, + "item_1736146823660": { + "attribute_name": "アクセス権", + "attribute_value_mlt": [ + { + "subitem_access_right": "embargoed access", + "subitem_access_right_uri": "http://purl.org/coar/access_right/c_f1cf" + } + ] + }, + "item_1736148125517": { + "attribute_type": "file", + "attribute_value_mlt": [ + {"date": [{"dateType": "Available", "dateValue": "2026-01-01"}], "accessrole": "open_date"} + ] + } + }, datetime(2026, 3, 1, 0, 0, 0)), + + # open_access file + (True, "item_1736146823660.attribute_value_mlt.subitem_access_right", datetime(2026, 3, 1, 0, 0, 0), { + "item_type_id": 1, + "item_1736146823660": { + "attribute_name": "アクセス権", + "attribute_value_mlt": [ + { + "subitem_access_right": "embargoed access", + "subitem_access_right_uri": "http://purl.org/coar/access_right/c_f1cf" + } + ] + }, + "item_1736148125517": { + "attribute_type": "file", + "attribute_value_mlt": [ + {"date": [{"dateType": "Available", "dateValue": "2026-04-01"}], "accessrole": "open_access"} + ] + } + }, datetime(2026, 4, 1, 0, 0, 0)), + + # date exists but no accessrole + (True, "item_1736146823660.attribute_value_mlt.subitem_access_right", datetime(2026, 3, 1, 0, 0, 0), { + "item_type_id": 1, + "item_1736146823660": { + "attribute_name": "アクセス権", + "attribute_value_mlt": [ + { + "subitem_access_right": "embargoed access", + "subitem_access_right_uri": "http://purl.org/coar/access_right/c_f1cf" + } + ] + }, + "item_1736148125517": { + "attribute_type": "file", + "attribute_value_mlt": [ + {"date": [{"dateType": "Available", "dateValue": "2027-01-01"}]} + ] + } + }, datetime(2026, 3, 1, 0, 0, 0)), + + # accessrole exists but no date + (True, "item_1736146823660.attribute_value_mlt.subitem_access_right", datetime(2026, 3, 1, 0, 0, 0), { + "item_type_id": 1, + "item_1736146823660": { + "attribute_name": "アクセス権", + "attribute_value_mlt": [ + { + "subitem_access_right": "embargoed access", + "subitem_access_right_uri": "http://purl.org/coar/access_right/c_f1cf" + } + ] + }, + "item_1736148125517": { + "attribute_type": "file", + "attribute_value_mlt": [ + {"accessrole": "open_date"} + ] + } + }, datetime(2026, 3, 1, 0, 0, 0)), + + # Multiple open_dates (with access rights info) + (True, "item_1736146823660.attribute_value_mlt.subitem_access_right", datetime(2026, 3, 1, 0, 0, 0), { + "item_type_id": 1, + "item_1736146823660": { + "attribute_name": "アクセス権", + "attribute_value_mlt": [ + { + "subitem_access_right": "embargoed access", + "subitem_access_right_uri": "http://purl.org/coar/access_right/c_f1cf" + } + ] + }, + "item_1736148125517": { + "attribute_type": "file", + "attribute_value_mlt": [ + {"date": [{"dateType": "Available", "dateValue": "2026-03-31"}], "accessrole": "open_date"}, + {"date": [{"dateType": "Available", "dateValue": "2026-03-30"}], "accessrole": "open_date"} + ] + } + }, datetime(2026, 3, 31, 0, 0, 0)), + + # Multiple open_dates (with access rights info), original_updated > max(open_dates) + (True, "item_1736146823660.attribute_value_mlt.subitem_access_right", datetime(2026, 4, 2, 0, 0, 0), { + "item_type_id": 1, + "item_1736146823660": { + "attribute_name": "アクセス権", + "attribute_value_mlt": [ + { + "subitem_access_right": "embargoed access", + "subitem_access_right_uri": "http://purl.org/coar/access_right/c_f1cf" + } + ] + }, + "item_1736148125517": { + "attribute_type": "file", + "attribute_value_mlt": [ + {"date": [{"dateType": "Available", "dateValue": "2026-03-31"}], "accessrole": "open_date"}, + {"date": [{"dateType": "Available", "dateValue": "2026-03-30"}], "accessrole": "open_date"} + ] + } + }, datetime(2026, 4, 2, 0, 0, 0)), + # WEKO_SEARCH_FIX_ACCESSRIGHTS is False + (False, "item_1736146823660.attribute_value_mlt.subitem_access_right", datetime(2026, 3, 1, 0, 0, 0), { + "item_type_id": 1, + "item_1736146823660": { + "attribute_name": "アクセス権", + "attribute_value_mlt": [ + { + "subitem_access_right": "embargoed access", + "subitem_access_right_uri": "http://purl.org/coar/access_right/c_f1cf" + } + ] + }, + "item_1736148125517": { + "attribute_type": "file", + "attribute_value_mlt": [ + {"date": [{"dateType": "Available", "dateValue": "2026-03-31"}], "accessrole": "open_date"}, + {"date": [{"dateType": "Available", "dateValue": "2026-03-30"}], "accessrole": "open_date"} + ] + } + }, datetime(2026, 3, 1, 0, 0, 0)), + + # _get_nested_value list branch (does not contain subitem_access_right) + (True, "item_foo.subitem_access_right", datetime(2026, 3, 1, 0, 0, 0), { + "item_type_id": 1, + "item_foo": [ + {"not_target": 1} + ] + }, datetime(2026, 3, 1, 0, 0, 0)), + + #Case where attribute_mlt is not in the path + (True, "item_foo.subitem_access_right",datetime(2026, 3, 1, 0, 0, 0), { + "item_type_id": 1, + "item_foo": { + "attribute_type": "アクセス権", + "attribute_value_mlt": [ + {"not_target": 1}, + {"subitem_access_right": "embargoed access"} + ] + } + }, + datetime(2026, 3, 1, 0, 0, 0) + ), + + # Case where the path key does not exist + (True,"item_foo.subitem_access_right", datetime(2026, 3, 1, 0, 0, 0), { + "item_type_id": 1, + "item_foo": { + "attribute_type": "file", + "attribute_value_mlt": [ + {"not_target": 1} + ] + } + }, + datetime(2026, 3, 1, 0, 0, 0) + ), + + # Case where value is neither list nor dict + (True, "item_foo.subitem_access_right" ,datetime(2026, 3, 1, 0, 0, 0),{ + "item_type_id": 1, + "item_foo": { + "attribute_type": "アクセス権", + "attribute_value_mlt": "invalid" + } + }, + datetime(2026, 3, 1, 0, 0, 0) + ), + + # Case where updated is None but opendate exists + (True, "item_1736146823660.attribute_value_mlt.subitem_access_right" ,None, { + "item_type_id": 1, + "item_1736146823660": { + "attribute_name": "アクセス権", + "attribute_value_mlt": [ + { + "subitem_access_right": "embargoed access", + "subitem_access_right_uri": "http://purl.org/coar/access_right/c_f1cf" + } + ] + }, + "item_1736148125517": { + "attribute_type": "file", + "attribute_value_mlt": [ + {"date": [{"dateType": "Available", "dateValue": "2026-03-31"}], "accessrole": "open_date"} + ] + } + }, + datetime(2026, 3, 31, 0, 0, 0) + ), + ] +) +# .tox/c1/bin/pytest --cov=invenio_records tests/test_api.py::test_record_updated -vv -s --cov-branch --cov-report=term --basetemp=/code/modules/invenio-records/.tox/c1/tmp +def test_record_updated(app, monkeypatch, access_path, fix_accessrights, updated, meta_patch, expected): + base_meta = { + "item_type_id": 1 + } + meta = copy.deepcopy(base_meta) + if meta_patch is not None: + meta.update(copy.deepcopy(meta_patch)) + else: + meta = None + + class DummyQuery: + def filter_by(self, id): + return self + def scalar(self): + return meta + + class DummySession: + def __init__(self): + self.session = self + def query(self, *args, **kwargs): + return DummyQuery() + + monkeypatch.setattr("weko_records.serializers.utils.get_mapping", lambda i, t: {"accessRights.@value": access_path}) + with app.app_context(): + from flask import current_app + current_app.config["WEKO_SEARCH_FIX_ACCESSRIGHTS"] = fix_accessrights + record = Record({}) + class DummyModel: + def __init__(self, updated, json, id=1): + self.updated = updated + self.json = json + self.id = id + record.model = DummyModel(updated=updated, json=meta, id=1) + monkeypatch.setattr("invenio_records.api.db", DummySession()) + result = record.updated + assert result == expected diff --git a/modules/invenio-resourcesyncserver/invenio_resourcesyncserver/query.py b/modules/invenio-resourcesyncserver/invenio_resourcesyncserver/query.py index f2d381b557..c7ee054d33 100644 --- a/modules/invenio-resourcesyncserver/invenio_resourcesyncserver/query.py +++ b/modules/invenio-resourcesyncserver/invenio_resourcesyncserver/query.py @@ -28,6 +28,8 @@ from weko_index_tree.api import Indexes from weko_schema_ui.models import PublishStatus from weko_search_ui.utils import execute_search_with_pagination +from invenio_oaiserver.query import range_query +from datetime import datetime, timedelta from .config import WEKO_ROOT_INDEX @@ -262,14 +264,31 @@ def _get_index_search_query(_date_from: str, _date_until: str) -> dict: "path": list_path } } - post_filter['bool']['must'].append({ - "range": { - "_updated": { - "lte": _date_until, - "gte": _date_from + if current_app.config.get('WEKO_SEARCH_FIX_ACCESSRIGHTS', False): + if len(_date_until) == 19 and 'T' in _date_until: + _date_until = ( + datetime.strptime(_date_until, '%Y-%m-%dT%H:%M:%S') + - timedelta(seconds=1) + ) + _date_until = _date_until.isoformat() + elif len(_date_until) == 10: + _date_until = ( + datetime.strptime(_date_until, '%Y-%m-%d') + - timedelta(seconds=1) + ) + _date_until = _date_until.isoformat() + rq = range_query(_date_from, _date_until) + if rq is not None: + post_filter['bool']['must'].append(rq.to_dict()) + else: + post_filter['bool']['must'].append({ + "range": { + "_updated": { + "lte": _date_until, + "gte": _date_from + } } - } - }) + }) # create search query try: query_q = json.dumps(query_q).replace("@index", q) @@ -285,14 +304,32 @@ def _get_index_search_query(_date_from: str, _date_until: str) -> dict: "path": list_path } }) - post_filter['bool']['must'].append({ - "range": { - "_updated": { - "lte": _date_until, - "gte": _date_from + if current_app.config.get('WEKO_SEARCH_FIX_ACCESSRIGHTS', False): + if len(_date_until) == 19 and 'T' in _date_until: + _date_until = ( + datetime.strptime(_date_until, '%Y-%m-%dT%H:%M:%S') + - timedelta(seconds=1) + ) + _date_until = _date_until.isoformat() + elif len(_date_until) == 10: + _date_until = ( + datetime.strptime(_date_until, '%Y-%m-%d') + - timedelta(seconds=1) + ) + _date_until = _date_until.isoformat() + rq = range_query(_date_from, _date_until) + if rq is not None: + post_filter['bool']['must'].append(rq.to_dict()) + else: + post_filter['bool']['must'].append({ + "range": { + "_updated": { + "lte": _date_until, + "gte": _date_from + } } - } - }) + }) + # create search query wild_card = [] child_list = Indexes.get_child_list(q) @@ -320,7 +357,6 @@ def _get_index_search_query(_date_from: str, _date_until: str) -> dict: # create a index search query query_q = _get_index_search_query(date_from, date_until) - try: search.update_from_dict(query_q) except SyntaxError: diff --git a/modules/invenio-resourcesyncserver/tests/test_query.py b/modules/invenio-resourcesyncserver/tests/test_query.py index 20a423e029..a9cfd0dbd8 100644 --- a/modules/invenio-resourcesyncserver/tests/test_query.py +++ b/modules/invenio-resourcesyncserver/tests/test_query.py @@ -6,7 +6,7 @@ import datetime from elasticsearch import helpers from mock import patch, MagicMock, Mock -from flask import current_app, make_response, request +from flask import current_app, make_response, request, Flask from flask_login import current_user from flask_babelex import Babel @@ -68,7 +68,7 @@ def test_item_path_search_factory(i18n_app, indices): with patch("weko_index_tree.api.Indexes.get_list_path_publish", return_value="test"): with patch("weko_index_tree.api.Indexes.get_child_list", return_value=[MagicMock()]): assert item_path_search_factory(data_1, index_id="Root Index") - + assert item_path_search_factory(data_1, index_id=33) @@ -81,3 +81,116 @@ def test_item_changes_search_factory(i18n_app, indices): with patch("weko_index_tree.api.Indexes.get_list_path_publish", return_value="test"): with patch("weko_index_tree.api.Indexes.get_child_list", return_value=[MagicMock()]): assert item_changes_search_factory(search, index_id="Root Index") + +@pytest.mark.parametrize("fix_access, is_root, date_until, rq_none, expect_range, expect_updated", [ + # fix_access, is_root, date_until, rq_none, expect_range, expect_updated + (True, False, '2020-12-31T23:59:59', False, True, False), # 19 digits, range_query enabled + (True, False, '2020-12-31', False, True, False), # 10 digits, range_query enabled + (True, False, 'invalid', False, True, False), # invalid value, range_query enabled + (True, False, '2020-12-31T23:59:59', True, False, False), # 19 digits, range_query is None + (False, False, '2020-12-31T23:59:59', False, False, True), # fix_access=False, _updated + (True, True, '2020-12-31T23:59:59', False, True, False), # root, range_query enabled + (False, True, '2020-12-31T23:59:59', False, False, True), # root, fix_access=False + (True, True, '2020-12-31', False, True, False), # root, 10 digits, range_query enabled + (True, True, 'invalid', True, False, False), # root, invalid value, range_query is None +]) +# .tox/c1/bin/pytest --cov=invenio_resourcesyncserver tests/test_query.py::test_item_changes_search_factory_branch -v -s -vv --cov-branch --cov-report=term --cov-config=tox.ini --basetemp=/code/modules/invenio-resourcesyncserver/.tox/c1/tmp +def test_item_changes_search_factory_branch(monkeypatch, fix_access, is_root, date_until, rq_none, expect_range, expect_updated): + # Flask Apps and Config + app = Flask(__name__) + app.config['WEKO_SEARCH_FIX_ACCESSRIGHTS'] = fix_access + app.config['WEKO_ROOT_INDEX'] = 0 + + # mock + class DummySearch: + def __init__(self): + self.query = None + def update_from_dict(self, q): + self.query = q + + class DummyItem: + cid = 'dummy' + + class DummyIndexes: + @staticmethod + def get_list_path_publish(index_id): + return [1, 2, 3] + @staticmethod + def get_child_list(q): + return [DummyItem()] + + called = {'range_query': False} + def fake_range_query(*args, **kwargs): + called['range_query'] = True + if rq_none: + return None + class DummyRQ: + def to_dict(self): + return {'RANGE_QUERY': True} + return DummyRQ() + + # Get the modules to be imported + from invenio_resourcesyncserver import query as query_mod + monkeypatch.setattr(query_mod, "range_query", fake_range_query) + monkeypatch.setattr(query_mod, "Indexes", DummyIndexes) + + with app.app_context(): + search = DummySearch() + index_id = 0 if is_root else 1 + result = query_mod.item_changes_search_factory( + search, index_id=index_id, date_from='2020-01-01', date_until=date_until + ) + q = result.query + if expect_range: + assert any( + (isinstance(m, dict) and 'RANGE_QUERY' in m) or + (hasattr(m, 'to_dict') and 'RANGE_QUERY' in m.to_dict()) + for m in q['post_filter']['bool']['must'] + ) + assert called['range_query'] + else: + # If range_query is None, RANGE_QUERY should not be included in must + assert not any( + (isinstance(m, dict) and 'RANGE_QUERY' in m) or + (hasattr(m, 'to_dict') and 'RANGE_QUERY' in m.to_dict()) + for m in q['post_filter']['bool']['must'] + ) + if expect_updated: + assert any( + (isinstance(m, dict) and '_updated' in m.get('range', {})) or + (hasattr(m, 'to_dict') and '_updated' in m.to_dict().get('range', {})) + for m in q['post_filter']['bool']['must'] + ) + +def test_item_changes_search_factory_except_baseexception(monkeypatch): + from invenio_resourcesyncserver import query as query_mod + from flask import Flask + class DummySearch: + def update_from_dict(self, q): + pass + # Mock json.dumps to raise TypeError + monkeypatch.setattr(query_mod.json, "dumps", lambda *a, **k: (_ for _ in ()).throw(TypeError("dummy"))) + # Mock Indexes.get_list_path_publish + monkeypatch.setattr(query_mod.Indexes, "get_list_path_publish", lambda idx: ["dummy"]) + app = Flask(__name__) + app.config["WEKO_ROOT_INDEX"] = 0 + with app.app_context(): + search = DummySearch() + # Confirm that the exception is suppressed and the function returns normally + result = query_mod.item_changes_search_factory(search, index_id=1) + assert result is not None + +def test_item_changes_search_factory_except_syntaxerror(monkeypatch): + from invenio_resourcesyncserver import query as query_mod + from flask import Flask + class DummySearch: + def update_from_dict(self, q): + raise SyntaxError("dummy syntax error") + # Mock Indexes.get_list_path_publish + monkeypatch.setattr(query_mod.Indexes, "get_list_path_publish", lambda idx: ["dummy"]) + app = Flask(__name__) + app.config["WEKO_ROOT_INDEX"] = 0 + with app.app_context(): + search = DummySearch() + with pytest.raises(query_mod.InvalidQueryRESTError): + query_mod.item_changes_search_factory(search, index_id=1) diff --git a/modules/weko-accounts/tests/test_views.py b/modules/weko-accounts/tests/test_views.py index a91aa5ee1d..658ba64681 100644 --- a/modules/weko-accounts/tests/test_views.py +++ b/modules/weko-accounts/tests/test_views.py @@ -2,7 +2,7 @@ import pytest import json import redis -from invenio_accounts.models import Role +from invenio_accounts.models import Role, User from flask import url_for,request,make_response,current_app,Flask from flask_login.utils import login_user,logout_user from flask_menu import current_menu @@ -18,6 +18,7 @@ find_user_by_email, shib_sp_login, _adjust_shib_admin_DB, + generate_ams_login_url, urlencode ) from weko_admin.models import AdminSettings @@ -26,6 +27,11 @@ def set_session(client,data): with client.session_transaction() as session: for k, v in data.items(): session[k] = v + +def del_session(client,key): + with client.session_transaction() as session: + del session[key] + #def _has_admin_access(): # .tox/c1/bin/pytest --cov=weko_accounts tests/test_views.py::test_has_admin_access -vv -s --cov-branch --cov-report=term --basetemp=/code/modules/weko-workflow/.tox/c1/tmp #def test_has_admin_access(request_context,users): @@ -35,12 +41,12 @@ def set_session(client,data): # logout_user() # login_user(users[4]["obj"]) # result = _has_admin_access() -# assert result == False +# assert result is False #def init_menu(): # .tox/c1/bin/pytest --cov=weko_accounts tests/test_views.py::test_init_menu -vv -s --cov-branch --cov-report=term --basetemp=/code/modules/weko-workflow/.tox/c1/tmp def test_init_menu(request_context): init_menu() - assert current_menu.submenu("setting.admin").active == True + assert current_menu.submenu("setting.admin").active is True assert current_menu.submenu("settings.admin").url == "/admin/" assert current_menu.submenu("settings.admin").text == ' Administration' @@ -96,6 +102,59 @@ def test_redirect_method(app,mocker): _redirect_method(True) mock_render.assert_called_with("http://test_server.localdomain/secure/login.py?next="+url) + url = 'ams' + with app.test_request_context(url): + current_app.config['WEKO_ACCOUNTS_SHIB_AMS_LOGIN_URL'] = '{}ams/login' + # Login is blocked. + mock_render = mocker.patch('weko_accounts.views.redirect',return_value=make_response()) + ams_error = 'Login is blocked.' + _redirect_method(True, ams_error) + mock_render.assert_called_with(\ + 'http://TEST_SERVER.localdomain/ams/login?error=Login+is+blocked.') + # There is no user information. + mock_render = mocker.patch('weko_accounts.views.redirect',return_value=make_response()) + ams_error = 'There is no user information.' + _redirect_method(True, ams_error) + mock_render.assert_called_with( + 'http://TEST_SERVER.localdomain/ams/login?error=There+is+no+user+information.') + # server error + mock_render = mocker.patch('weko_accounts.views.redirect',return_value=make_response()) + ams_error = 'Server error has occurred. Please contact server administrator.' + _redirect_method(True, ams_error) + mock_render.assert_called_with(\ + 'http://TEST_SERVER.localdomain/ams/login?'\ + 'error=Server+error+has+occurred.+Please+contact+server+administrator.') + # other error + mock_render = mocker.patch('weko_accounts.views.redirect',return_value=make_response()) + ams_error = 'Error Message' + _redirect_method(True, ams_error) + mock_render.assert_called_with(\ + 'http://TEST_SERVER.localdomain/ams/login?error=Error+Message') + +# .tox/c1/bin/pytest --cov=weko_accounts tests/test_views.py::test_generate_ams_login_url -vv -s --cov-branch --cov-report=term --basetemp=/code/modules/weko-workflow/.tox/c1/tmp +def test_generate_ams_login_url(app): + with app.test_request_context(): + current_app.config['WEKO_ACCOUNTS_SHIB_AMS_LOGIN_URL'] = '{}ams/login' + # Missing Shib-Session-ID! + ams_error = 'Missing Shib-Session-ID!' + url = generate_ams_login_url(ams_error) + assert url == '/ams/login?error=Missing+Shib-Session-ID%21' + + # Missing SHIB_ATTRs! + ams_error = 'Missing SHIB_ATTRs!' + url = generate_ams_login_url(ams_error) + assert url == '/ams/login?error=Missing+SHIB_ATTRs%21' + + # Login is blocked. + ams_error = 'Login is blocked.' + url = generate_ams_login_url(ams_error) + assert url == '/ams/login?error=Login+is+blocked.' + + # Server error has occurred. Please contact server administrator. + ams_error = 'Server error has occurred. Please contact server administrator.' + url = generate_ams_login_url(ams_error) + assert url == '/ams/login?error=Server+error+has+occurred.+Please+contact+server+administrator.' + #def index(): # .tox/c1/bin/pytest --cov=weko_accounts tests/test_views.py::test_index -vv -s --cov-branch --cov-report=term --basetemp=/code/modules/weko-workflow/.tox/c1/tmp def test_index(client,mocker): @@ -109,53 +168,101 @@ def test_shib_auto_login(client,redis_connect,mocker): url = url_for("weko_accounts.shib_auto_login") set_session(client,{"shib_session_id":None}) # not exist shib_session_id - mock_redirect_ = mocker.patch("weko_accounts.views._redirect_method",return_value=make_response()) + mock_redirect_ = mocker.patch("weko_accounts.views._redirect_method", + return_value=make_response()) client.get(url) mock_redirect_.assert_called_once() + # not exist shib_session_id(AMS) + mock_redirect_ = mocker.patch("weko_accounts.views._redirect_method", + return_value=make_response()) + client.get(url+"?next=ams") + mock_redirect_.assert_called_once() + called_args, called_kwargs = mock_redirect_.call_args + assert called_args[0] is True + assert "Missing Shib-Session-ID!" in called_kwargs.get("ams_error", "") - mocker.patch("weko_accounts.views.RedisConnection.connection",return_value=redis_connect) # not exist cache - mock_redirect_ = mocker.patch("weko_accounts.views._redirect_method",return_value=make_response()) + mocker.patch("weko_accounts.views.RedisConnection.connection", + return_value=redis_connect) + mock_redirect_ = mocker.patch("weko_accounts.views._redirect_method", + return_value=make_response()) client.get(url+"?Shib-Session-ID=2222") mock_redirect_.assert_called_once() + # not exist cache(AMS) + mocker.patch("weko_accounts.views.RedisConnection.connection", + return_value=redis_connect) + mock_redirect_ = mocker.patch("weko_accounts.views._redirect_method", + return_value=make_response()) + client.get(url+"?next=ams&Shib-Session-ID=2222") + mock_redirect_.assert_called_once() + called_args, called_kwargs = mock_redirect_.call_args + assert called_args[0] is True + assert "Missing SHIB_CACHE_PREFIX!" in called_kwargs.get("ams_error", "") - - redis_connect.put("Shib-Session-1111",bytes("","utf-8")) # not cache_val - mock_redirect_ = mocker.patch("weko_accounts.views._redirect_method",return_value=make_response()) + redis_connect.put("Shib-Session-1111",bytes("","utf-8")) + mock_redirect_ = mocker.patch("weko_accounts.views._redirect_method", + return_value=make_response()) client.get(url+"?Shib-Session-ID=1111") mock_redirect_.assert_called_once() - assert redis_connect.redis.exists("Shib-Session-1111") == False + assert redis_connect.redis.exists("Shib-Session-1111") is False + + # not cache_val(AMS) + redis_connect.put("Shib-Session-1111",bytes("","utf-8")) + mock_redirect_ = mocker.patch("weko_accounts.views._redirect_method", + return_value=make_response()) + client.get(url+"?next=ams&Shib-Session-ID=1111") + mock_redirect_.assert_called_once() + called_args, called_kwargs = mock_redirect_.call_args + assert called_args[0] is True + assert "Missing SHIB_ATTR!" in called_kwargs.get("ams_error", "") + # is_auto_bind is false, check_in is error mock_get_relation = mocker.patch("weko_accounts.views.ShibUser.get_relation_info") mock_new_relation = mocker.patch("weko_accounts.views.ShibUser.new_relation_info") mock_shib_login = mocker.patch("weko_accounts.views.ShibUser.shib_user_login") redis_connect.put("Shib-Session-1111",bytes('{"shib_eppn":"test_eppn"}',"utf-8")) - # is_auto_bind is false, check_in is error - mock_redirect_ = mocker.patch("weko_accounts.views._redirect_method",return_value=make_response()) + mock_redirect_ = mocker.patch("weko_accounts.views._redirect_method", + return_value=make_response()) with patch("weko_accounts.views.ShibUser.check_in",return_value="test_error"): client.get(url+"?Shib-Session-ID=1111") mock_get_relation.assert_called_once() mock_redirect_.assert_called_once() - assert redis_connect.redis.exists("Shib-Session-1111") == False + assert redis_connect.redis.exists("Shib-Session-1111") is False + + # is_auto_bind is false, check_in is error(AMS) + mock_get_relation = mocker.patch("weko_accounts.views.ShibUser.get_relation_info") + mock_new_relation = mocker.patch("weko_accounts.views.ShibUser.new_relation_info") + mock_shib_login = mocker.patch("weko_accounts.views.ShibUser.shib_user_login") redis_connect.put("Shib-Session-1111",bytes('{"shib_eppn":"test_eppn"}',"utf-8")) + mock_redirect_ = mocker.patch("weko_accounts.views._redirect_method", + return_value=make_response()) + with patch("weko_accounts.views.ShibUser.check_in",return_value="test_error"): + client.get(url+"?next=ams&Shib-Session-ID=1111") + mock_get_relation.assert_called_once() + mock_redirect_.assert_called_once() + called_args, called_kwargs = mock_redirect_.call_args + assert called_args[0] is True + assert "test_error" in called_kwargs.get("ams_error", "") + redis_connect.put("Shib-Session-1111",bytes('{"shib_eppn":"test_eppn"}',"utf-8")) set_session(client,{"shib_session_id":"1111"}) with patch("weko_accounts.views.ShibUser.check_in",return_value=None): # is_auto_bind is true,shib_user is None shibuser = ShibUser({}) shibuser.user = User(id=1) with patch("weko_accounts.views.ShibUser",return_value=shibuser): - mock_redirect = mocker.patch("weko_accounts.views.redirect",return_value=make_response()) + mock_redirect = mocker.patch("weko_accounts.views.redirect", + return_value=make_response()) client.get(url) mock_new_relation.assert_called_once() mock_shib_login.assert_not_called() mock_redirect.assert_called_with("/") - assert redis_connect.redis.exists("Shib-Session-1111") == False + assert redis_connect.redis.exists("Shib-Session-1111") is False # is_auto_bind is true,shib_user exis redis_connect.put("Shib-Session-1111",bytes('{"shib_eppn":"test_eppn"}',"utf-8")) @@ -165,19 +272,50 @@ def test_shib_auto_login(client,redis_connect,mocker): shibuser.shib_user = "test_user" shibuser.user = User(id=1) with patch("weko_accounts.views.ShibUser",return_value=shibuser): - mock_redirect = mocker.patch("weko_accounts.views.redirect",return_value=make_response()) + mock_redirect = mocker.patch("weko_accounts.views.redirect", + return_value=make_response()) client.get(url+'?next=/next_page') mock_redirect.assert_called_with("/next_page") mock_shib_login.assert_called_once() - assert redis_connect.redis.exists("Shib-Session-1111") == False + assert redis_connect.redis.exists("Shib-Session-1111") is False + + # is_auto_bind is true,shib_user exis(AMS) + mock_shib_login.reset_mock() + redis_connect.put("Shib-Session-1111",bytes('{"shib_eppn":"test_eppn"}',"utf-8")) + set_session(client,{"shib_session_id":"1111","next":"/next_page"}) + + shibuser = ShibUser({}) + shibuser.shib_user = "test_user" + shibuser.user = User(id=1) + with patch("weko_accounts.views.ShibUser",return_value=shibuser): + mock_redirect = mocker.patch("weko_accounts.views.redirect", + return_value=make_response()) + client.get(url+'?next=ams') + called_args, _ = mock_redirect.call_args + mock_redirect.assert_called_with("/?next=ams") + mock_shib_login.assert_called_once() + assert redis_connect.redis.exists("Shib-Session-1111") is False + # raise BaseException with patch("weko_accounts.views.RedisConnection",side_effect=BaseException("test_error")): res = client.get(url+"?Shib-Session-ID=1111") assert res.status_code == 400 + + mock_redirect_ = mocker.patch("weko_accounts.views._redirect_method", + return_value=make_response()) + with patch("weko_accounts.views.RedisConnection",side_effect=BaseException("test_error")): + res = client.get(url+"?next=ams&Shib-Session-ID=1111") + mock_redirect_.assert_called_once() + called_args, called_kwargs = mock_redirect_.call_args + assert called_args[0] is True + assert "Server error has occurred. Please contact server " \ + "administrator." in called_kwargs.get("ams_error", "") + #def confirm_user(): # .tox/c1/bin/pytest --cov=weko_accounts tests/test_views.py::test_confirm_user -vv -s --cov-branch --cov-report=term --basetemp=/code/modules/weko-workflow/.tox/c1/tmp def test_confirm_user(client,redis_connect,mocker): - mocker.patch("weko_accounts.views.RedisConnection.connection",return_value=redis_connect) + mocker.patch("weko_accounts.views.RedisConnection.connection", + return_value=redis_connect) mocker.patch("weko_accounts.views.ShibUser.shib_user_login") url = url_for("weko_accounts.confirm_user") @@ -188,19 +326,53 @@ def test_confirm_user(client,redis_connect,mocker): client.post(url,data=form) mock_flash.assert_called_with("csrf_random",category="error") + # not correct csrf_random(AMS) + form = {"csrf_random":"test_csrf"} + mock_redirect_ = mocker.patch("weko_accounts.views._redirect_method", + return_value=make_response()) + set_session(client,{"next": "ams"}) + client.post(url, data=form) + mock_redirect_.assert_called_once() + called_args, called_kwargs = mock_redirect_.call_args + assert called_args[0] is True + assert "csrf_random" in called_kwargs.get("ams_error", "") + # not exist shib_session_id set_session(client,{"csrf_random":"test_csrf","shib_session_id":None}) + del_session(client, "next") mock_flash = mocker.patch("weko_accounts.views.flash") client.post(url,data=form) mock_flash.assert_called_with("shib_session_id",category="error") + # not exist shib_session_id(AMS) + mock_redirect_ = mocker.patch("weko_accounts.views._redirect_method", + return_value=make_response()) + set_session(client,{"next": "ams"}) + client.post(url, data=form) + mock_redirect_.assert_called_once() + called_args, called_kwargs = mock_redirect_.call_args + assert called_args[0] is True + assert "Missing Shib-Session-ID!" in called_kwargs.get("ams_error", "") + # not exist cache_key set_session(client,{"csrf_random":"test_csrf","shib_session_id":"2222"}) + del_session(client, "next") mock_flash = mocker.patch("weko_accounts.views.flash") client.post(url,data=form) mock_flash.assert_called_with("cache_key",category="error") + # not exist cache_key(AMS) + mock_redirect_ = mocker.patch("weko_accounts.views._redirect_method", + return_value=make_response()) + set_session(client,{"next": "ams"}) + client.post(url, data=form) + mock_redirect_.assert_called_once() + called_args, called_kwargs = mock_redirect_.call_args + assert called_args[0] is True + assert "Missing SHIB_CACHE_PREFIX!" in called_kwargs.get("ams_error", "") + set_session(client,{"csrf_random":"test_csrf","shib_session_id":"1111"}) + del_session(client, "next") # not exist cache_value redis_connect.put("Shib-Session-1111",bytes("","utf-8")) mock_flash = mocker.patch("weko_accounts.views.flash") @@ -208,20 +380,45 @@ def test_confirm_user(client,redis_connect,mocker): mock_flash.assert_called_with("cache_val",category="error") assert redis_connect.redis.exists("Shib-Session-1111") is False + # not exist cache_value(AMS) + redis_connect.put("Shib-Session-1111",bytes("","utf-8")) + mock_redirect_ = mocker.patch("weko_accounts.views._redirect_method", + return_value=make_response()) + set_session(client,{"next": "ams"}) + client.post(url, data=form) + mock_redirect_.assert_called_once() + called_args, called_kwargs = mock_redirect_.call_args + assert called_args[0] is True + assert "Missing SHIB_ATTR!" in called_kwargs.get("ams_error", "") + # shib_user.check_weko_user is false redis_connect.put("Shib-Session-1111",bytes('{"shib_eppn":"test_eppn"}',"utf-8")) with patch("weko_accounts.views.ShibUser.check_weko_user",return_value=False): mock_flash = mocker.patch("weko_accounts.views.flash") + del_session(client, "next") client.post(url,data=form) mock_flash.assert_called_with("check_weko_user",category="error") assert redis_connect.redis.exists("Shib-Session-1111") is False + # shib_user.check_weko_user is false(AMS) + redis_connect.put("Shib-Session-1111",bytes('{"shib_eppn":"test_eppn"}',"utf-8")) + with patch("weko_accounts.views.ShibUser.check_weko_user",return_value=False): + mock_redirect_ = mocker.patch("weko_accounts.views._redirect_method", + return_value=make_response()) + set_session(client, {"next": "ams"}) + client.post(url,data=form) + mock_redirect_.assert_called_once() + called_args, called_kwargs = mock_redirect_.call_args + assert called_args[0] is True + assert "There is no user information." in called_kwargs.get("ams_error", "") + redis_connect.put("Shib-Session-1111",bytes('{"shib_eppn":"test_eppn"}',"utf-8")) with patch("weko_accounts.views.ShibUser.check_weko_user",return_value=True): # shib_user.bind_relation_info is false with patch("weko_accounts.views.ShibUser.bind_relation_info",return_value=False): redis_connect.put("Shib-Session-1111",bytes('{"shib_eppn":"test_eppn"}',"utf-8")) mock_flash = mocker.patch("weko_accounts.views.flash") + del_session(client, "next") client.post(url,data=form) mock_flash.assert_called_with("FAILED bind_relation_info!",category="error") with patch("weko_accounts.views.ShibUser.bind_relation_info",return_value=True): @@ -236,35 +433,87 @@ def test_confirm_user(client,redis_connect,mocker): redis_connect.put("Shib-Session-1111",bytes('{"shib_eppn":"test_eppn"}',"utf-8")) shibuser = ShibUser({}) shibuser.user = User(id=1) - with patch("weko_accounts.views.ShibUser",return_value=shibuser): - mock_redirect = mocker.patch("weko_accounts.views.redirect",return_value=make_response()) + with patch("weko_accounts.views.ShibUser", + return_value=shibuser): + mock_redirect = mocker.patch("weko_accounts.views.redirect", + return_value=make_response()) client.post(url,data=form) mock_redirect.assert_called_with("/") assert redis_connect.redis.exists("Shib-Session-1111") is False - # exist ShibUser.shib_user - set_session(client,{"csrf_random":"test_csrf","shib_session_id":"1111","next":"/next_page"}) - redis_connect.put("Shib-Session-1111",bytes('{"shib_eppn":"test_eppn"}',"utf-8")) - + # exist ShibUser.shib_user + set_session(client,{"csrf_random":"test_csrf", + "shib_session_id":"1111","next":"/next_page"}) + redis_connect.put("Shib-Session-1111",bytes('{"shib_eppn":"test_eppn"}',"utf-8")) shibuser = ShibUser({}) shibuser.shib_user = "test_user" shibuser.user = User(id=1) with patch("weko_accounts.views.ShibUser",return_value=shibuser): - mock_redirect = mocker.patch("weko_accounts.views.redirect",return_value=make_response()) + mock_redirect = mocker.patch("weko_accounts.views.redirect", + return_value=make_response()) mock_flash = mocker.patch("weko_accounts.views.flash") client.post(url,data=form) mock_redirect.assert_called_with("/next_page") assert redis_connect.redis.exists("Shib-Session-1111") is False + redis_connect.put("Shib-Session-1111",bytes('{"shib_eppn":"test_eppn"}',"utf-8")) + with patch("weko_accounts.views.ShibUser.check_weko_user",return_value=True): + # shib_user.bind_relation_info is false + with patch("weko_accounts.views.ShibUser.bind_relation_info",return_value=False): + redis_connect.put("Shib-Session-1111",bytes('{"shib_eppn":"test_eppn"}',"utf-8")) + mock_redirect_ = mocker.patch("weko_accounts.views._redirect_method", + return_value=make_response()) + set_session(client, {"next": "ams"}) + client.post(url,data=form) + mock_redirect_.assert_called_once() + called_args, called_kwargs = mock_redirect_.call_args + assert called_args[0] is True + assert "FAILED bind_relation_info!" in called_kwargs.get("ams_error", "") + with patch("weko_accounts.views.ShibUser.bind_relation_info",return_value=True): + # ShibUser.check_in is error + with patch("weko_accounts.views.ShibUser.check_in",return_value="test_error"): + mock_redirect_ = mocker.patch("weko_accounts.views._redirect_method", + return_value=make_response()) + client.post(url,data=form) + mock_redirect_.assert_called_once() + called_args, called_kwargs = mock_redirect_.call_args + assert called_args[0] is True + assert "test_error" in called_kwargs.get("ams_error", "") + with patch("weko_accounts.views.ShibUser.check_in",return_value=None): + # ShibUser.shib_user is None,not exist next in session + redis_connect.put("Shib-Session-1111",bytes('{"shib_eppn":"test_eppn"}',"utf-8")) + shibuser = ShibUser({}) + shibuser.user = User(id=1) + with patch("weko_accounts.views.ShibUser",return_value=shibuser): + mock_redirect = mocker.patch("weko_accounts.views.redirect", + return_value=make_response()) + client.post(url,data=form) + called_args, _ = mock_redirect.call_args + mock_redirect.assert_called_with("/?next=ams") + assert redis_connect.redis.exists("Shib-Session-1111") is False + # raise BaseException with patch("weko_accounts.views._redirect_method",side_effect=BaseException("test_error")): + del_session(client, "next") res = client.post(url,data=form) assert res.status_code == 400 + mock_redirect_ = mocker.patch("weko_accounts.views._redirect_method", + return_value=make_response()) + with patch("weko_accounts.views.RedisConnection",side_effect=BaseException("test_error")): + set_session(client, {"next": "ams"}) + res = client.post(url,data=form) + mock_redirect_.assert_called_once() + called_args, called_kwargs = mock_redirect_.call_args + assert called_args[0] is True + assert "Server error has occurred. Please contact server " \ + "administrator." in called_kwargs.get("ams_error", "") + #def confirm_user_without_page(): # .tox/c1/bin/pytest --cov=weko_accounts tests/test_views.py::test_confirm_user_without_page -vv -s --cov-branch --cov-report=term --basetemp=/code/modules/weko-workflow/.tox/c1/tmp def test_confirm_user_without_page(client,redis_connect,mocker): - mocker.patch("weko_accounts.views.RedisConnection.connection",return_value=redis_connect) + mocker.patch("weko_accounts.views.RedisConnection.connection", + return_value=redis_connect) mocker.patch("weko_accounts.views.ShibUser.shib_user_login") url = url_for("weko_accounts.confirm_user_without_page") @@ -273,11 +522,29 @@ def test_confirm_user_without_page(client,redis_connect,mocker): client.get(url, query_string={"Shib-Session-ID":None}) mock_flash.assert_called_with("shib_session_id",category="error") + # not exist shib_session_id(AMS) + mock_redirect_ = mocker.patch("weko_accounts.views._redirect_method", + return_value=make_response()) + client.get(url+"?next=ams") + mock_redirect_.assert_called_once() + called_args, called_kwargs = mock_redirect_.call_args + assert called_args[0] is True + assert "Missing Shib-Session-ID!" in called_kwargs.get("ams_error", "") + # not exist cache_key mock_flash = mocker.patch("weko_accounts.views.flash") client.get(url, query_string={"Shib-Session-ID":"2222"}) mock_flash.assert_called_with("cache_key",category="error") + # not exist cache_key(AMS) + mock_redirect_ = mocker.patch("weko_accounts.views._redirect_method", + return_value=make_response()) + client.get(url, query_string={"next":"ams","Shib-Session-ID":"2222"}) + mock_redirect_.assert_called_once() + called_args, called_kwargs = mock_redirect_.call_args + assert called_args[0] is True + assert "Missing SHIB_CACHE_PREFIX!" in called_kwargs.get("ams_error", "") + # not exist cache_value redis_connect.put("Shib-Session-1111",bytes("","utf-8")) mock_flash = mocker.patch("weko_accounts.views.flash") @@ -285,6 +552,16 @@ def test_confirm_user_without_page(client,redis_connect,mocker): mock_flash.assert_called_with("cache_val",category="error") assert redis_connect.redis.exists("Shib-Session-1111") is False + # not exist cache_value(AMS) + redis_connect.put("Shib-Session-1111",bytes("","utf-8")) + mock_redirect_ = mocker.patch("weko_accounts.views._redirect_method", + return_value=make_response()) + client.get(url, query_string={"next":"ams","Shib-Session-ID":"1111"}) + mock_redirect_.assert_called_once() + called_args, called_kwargs = mock_redirect_.call_args + assert called_args[0] is True + assert "Missing SHIB_ATTR!" in called_kwargs.get("ams_error", "") + redis_connect.put("Shib-Session-1111",bytes('{"shib_eppn":"test_eppn"}',"utf-8")) with patch("weko_accounts.views.ShibUser.check_weko_user",return_value=True): # shib_user.bind_relation_info is false @@ -305,7 +582,8 @@ def test_confirm_user_without_page(client,redis_connect,mocker): with patch("weko_accounts.views.ShibUser.check_in",return_value=None): # ShibUser.shib_user is None,not exist next in session redis_connect.put("Shib-Session-1111",bytes('{"shib_eppn":"test_eppn"}',"utf-8")) - mock_redirect = mocker.patch("weko_accounts.views.redirect",return_value=make_response()) + mock_redirect = mocker.patch("weko_accounts.views.redirect", + return_value=make_response()) client.get(url, query_string={"Shib-Session-ID":"1111"}) mock_redirect.assert_called_with("/") assert redis_connect.redis.exists("Shib-Session-1111") is False @@ -316,7 +594,8 @@ def test_confirm_user_without_page(client,redis_connect,mocker): shibuser = ShibUser({}) shibuser.shib_user = "test_user" with patch("weko_accounts.views.ShibUser",return_value=shibuser): - mock_redirect = mocker.patch("weko_accounts.views.redirect",return_value=make_response()) + mock_redirect = mocker.patch("weko_accounts.views.redirect", + return_value=make_response()) mock_flash = mocker.patch("weko_accounts.views.flash") client.get(url, query_string={"Shib-Session-ID":"1111"}) mock_redirect.assert_called_with("/") @@ -328,22 +607,96 @@ def test_confirm_user_without_page(client,redis_connect,mocker): shibuser = ShibUser({}) shibuser.shib_user = "test_user" with patch("weko_accounts.views.ShibUser",return_value=shibuser): - mock_redirect = mocker.patch("weko_accounts.views.redirect",return_value=make_response()) + mock_redirect = mocker.patch("weko_accounts.views.redirect", + return_value=make_response()) mock_flash = mocker.patch("weko_accounts.views.flash") client.get(url, query_string={"Shib-Session-ID":"1111","next":"/next_page"}) mock_redirect.assert_called_with("/next_page") assert redis_connect.redis.exists("Shib-Session-1111") is False + redis_connect.put("Shib-Session-1111",bytes('{"shib_eppn":"test_eppn"}',"utf-8")) + with patch("weko_accounts.views.ShibUser.check_weko_user",return_value=True): + # shib_user.bind_relation_info is false + with patch("weko_accounts.views.ShibUser.bind_relation_info",return_value=False): + redis_connect.put("Shib-Session-1111",bytes('{"shib_eppn":"test_eppn"}',"utf-8")) + mock_redirect_ = mocker.patch("weko_accounts.views._redirect_method", + return_value=make_response()) + client.get(url, query_string={"next":"ams","Shib-Session-ID":"1111"}) + mock_redirect_.assert_called_once() + called_args, called_kwargs = mock_redirect_.call_args + assert called_args[0] is True + assert "FAILED bind_relation_info!" in called_kwargs.get("ams_error", "") + with patch("weko_accounts.views.ShibUser.bind_relation_info",return_value=True): + # ShibUser.check_in is error + with patch("weko_accounts.views.ShibUser.check_in",return_value="test_error"): + redis_connect.put("Shib-Session-1111",bytes('{"shib_eppn":"test_eppn"}',"utf-8")) + mock_redirect_ = mocker.patch("weko_accounts.views._redirect_method", + return_value=make_response()) + client.get(url, query_string={"next":"ams","Shib-Session-ID":"1111"}) + mock_redirect_.assert_called_once() + called_args, called_kwargs = mock_redirect_.call_args + assert called_args[0] is True + assert "test_error" in called_kwargs.get("ams_error", "") + with patch("weko_accounts.views.ShibUser.check_in",return_value=None): + # ShibUser.shib_user is None,not exist next in session + redis_connect.put("Shib-Session-1111",bytes('{"shib_eppn":"test_eppn"}',"utf-8")) + shibuser = ShibUser({}) + shibuser.user = User(id=1) + with patch("weko_accounts.views.ShibUser",return_value=shibuser): + mock_redirect = mocker.patch("weko_accounts.views.redirect", + return_value=make_response()) + client.get(url, query_string={"next":"ams","Shib-Session-ID":"1111"}) + called_args, _ = mock_redirect.call_args + mock_redirect.assert_called_with("/?next=ams") + assert redis_connect.redis.exists("Shib-Session-1111") is False + + # exist ShibUser.shib_user + redis_connect.put("Shib-Session-1111",bytes('{"shib_eppn":"test_eppn"}',"utf-8")) + + shibuser = ShibUser({}) + shibuser.shib_user = "test_user" + shibuser.user = User(id=1) + with patch("weko_accounts.views.ShibUser",return_value=shibuser): + mock_redirect = mocker.patch("weko_accounts.views.redirect", + return_value=make_response()) + client.get(url, query_string={"next":"ams","Shib-Session-ID":"1111"}) + called_args, _ = mock_redirect.call_args + mock_redirect.assert_called_with("/?next=ams") + assert redis_connect.redis.exists("Shib-Session-1111") is False + + # exist ShibUser.shib_user + redis_connect.put("Shib-Session-1111",bytes('{"shib_eppn":"test_eppn"}',"utf-8")) + shibuser = ShibUser({}) + shibuser.shib_user = "test_user" + shibuser.user = User(id=1) + with patch("weko_accounts.views.ShibUser",return_value=shibuser): + mock_redirect = mocker.patch("weko_accounts.views.redirect", + return_value=make_response()) + client.get(url, query_string={"next":"ams","Shib-Session-ID":"1111"}) + called_args, _ = mock_redirect.call_args + mock_redirect.assert_called_with("/?next=ams") + assert redis_connect.redis.exists("Shib-Session-1111") is False + # raise BaseException with patch("weko_accounts.views._redirect_method",side_effect=BaseException("test_error")): res = client.get(url) assert res.status_code == 400 + mock_redirect_ = mocker.patch("weko_accounts.views._redirect_method", + return_value=make_response()) + with patch("weko_accounts.views.RedisConnection",side_effect=BaseException("test_error")): + client.get(url, query_string={"next":"ams","Shib-Session-ID":"1111"}) + mock_redirect_.assert_called_once() + called_args, called_kwargs = mock_redirect_.call_args + assert called_args[0] is True + assert "Server error has occurred. Please contact server " \ + "administrator." in called_kwargs.get("ams_error", "") #def shib_login(): # .tox/c1/bin/pytest --cov=weko_accounts tests/test_views.py::test_shib_login -vv -s --cov-branch --cov-report=term --basetemp=/code/modules/weko-workflow/.tox/c1/tmp def test_shib_login(client,redis_connect,users,mocker): - mocker.patch("weko_accounts.views.RedisConnection.connection",return_value=redis_connect) + mocker.patch("weko_accounts.views.RedisConnection.connection", + return_value=redis_connect) mocker.patch("weko_accounts.views.generate_random_str",return_value="asdfghjkl") url_base = url_for("weko_accounts.shib_login") @@ -352,13 +705,32 @@ def test_shib_login(client,redis_connect,users,mocker): client.get(url_base) mock_flash.assert_called_with("Missing Shib-Session-ID!",category="error") - url = url_base+"?Shib-Session-ID=2222" + # not shib_session_id(AMS) + mock_redirect_ = mocker.patch("weko_accounts.views._redirect_method", + return_value=make_response()) + client.get(url_base+"?next=ams") + mock_redirect_.assert_called_once() + called_args, called_kwargs = mock_redirect_.call_args + assert called_args[0] is True + assert "Missing Shib-Session-ID!" in called_kwargs.get("ams_error", "") + url = url_base+"?Shib-Session-ID=2222" # not exist cache_key mock_flash = mocker.patch("weko_accounts.views.flash") client.get(url) mock_flash.assert_called_with("Missing SHIB_CACHE_PREFIX!",category="error") + # not exist cache_key(AMS) + mocker.patch("weko_accounts.views.RedisConnection.connection", + return_value=redis_connect) + mock_redirect_ = mocker.patch("weko_accounts.views._redirect_method", + return_value=make_response()) + client.get(url+"&next=ams") + mock_redirect_.assert_called_once() + called_args, called_kwargs = mock_redirect_.call_args + assert called_args[0] is True + assert "Missing SHIB_CACHE_PREFIX!" in called_kwargs.get("ams_error", "") + url = url_base+"?Shib-Session-ID=1111" # not cache_val redis_connect.put("Shib-Session-1111",bytes('',"utf-8")) @@ -367,23 +739,50 @@ def test_shib_login(client,redis_connect,users,mocker): mock_flash.assert_called_with("Missing SHIB_ATTR!",category="error") assert redis_connect.redis.exists("Shib-Session-1111") is False + # not cache_val(AMS) + redis_connect.put("Shib-Session-1111",bytes('',"utf-8")) + mock_redirect_ = mocker.patch("weko_accounts.views._redirect_method", + return_value=make_response()) + client.get(url+"&next=ams") + mock_redirect_.assert_called_once() + called_args, called_kwargs = mock_redirect_.call_args + assert called_args[0] is True + assert "Missing SHIB_ATTR!" in called_kwargs.get("ams_error", "") + # exist user - redis_connect.put("Shib-Session-1111",bytes('{"shib_eppn":"test_eppn","shib_mail":"user@test.org"}',"utf-8")) - mock_render = mocker.patch("weko_accounts.views.render_template",return_value=make_response()) + redis_connect.put("Shib-Session-1111", + bytes('{"shib_eppn":"test_eppn","shib_mail":"user@test.org"}',"utf-8")) + mock_render = mocker.patch("weko_accounts.views.render_template", + return_value=make_response()) client.get(url) - mock_render.assert_called_with('weko_accounts/confirm_user.html',csrf_random="asdfghjkl",email="user@test.org") + mock_render.assert_called_with('weko_accounts/confirm_user.html', + csrf_random="asdfghjkl",email="user@test.org") # not exist user - redis_connect.put("Shib-Session-1111",bytes('{"shib_eppn":"test_eppn","shib_mail":"not_exist_user@test.org"}',"utf-8")) - mock_render = mocker.patch("weko_accounts.views.render_template",return_value=make_response()) + redis_connect.put("Shib-Session-1111", + bytes('{"shib_eppn":"test_eppn",' \ + '"shib_mail":"not_exist_user@test.org"}',"utf-8")) + mock_render = mocker.patch("weko_accounts.views.render_template", + return_value=make_response()) client.get(url) - mock_render.assert_called_with('weko_accounts/confirm_user.html',csrf_random="asdfghjkl",email="") + mock_render.assert_called_with('weko_accounts/confirm_user.html', + csrf_random="asdfghjkl",email="") # raise BaseException with patch("weko_accounts.views.flash",side_effect=BaseException("test_error")): res = client.get(url_base) assert res.status_code == 400 + mock_redirect_ = mocker.patch("weko_accounts.views._redirect_method", + return_value=make_response()) + with patch("weko_accounts.views.RedisConnection",side_effect=BaseException("test_error")): + res = client.get(url_base+"?Shib-Session-ID=1111&next=ams") + mock_redirect_.assert_called_once() + called_args, called_kwargs = mock_redirect_.call_args + assert called_args[0] is True + assert "Server error has occurred. Please contact server " \ + "administrator." in called_kwargs.get("ams_error", "") + #def shib_sp_login(): # .tox/c1/bin/pytest --cov=weko_accounts tests/test_views.py::test_shib_sp_login -vv -s --cov-branch --cov-report=term --basetemp=/code/modules/weko-workflow/.tox/c1/tmp def test_shib_sp_login(client, redis_connect,mocker, db, users): @@ -397,6 +796,14 @@ def test_shib_sp_login(client, redis_connect,mocker, db, users): mock_flash.assert_called_with("Missing Shib-Session-ID!",category="error") mock_redirect.assert_called_with(url_for("security.login")) + # not shib_session_id(AMS) + mock_generate_ams_login_url = mocker.patch("weko_accounts.views.generate_ams_login_url", + return_value=make_response()) + client.post(url+"?next=ams") + mock_generate_ams_login_url.assert_called_once() + called_args, _ = mock_generate_ams_login_url.call_args + assert "Missing Shib-Session-ID!" in called_args[0] + current_app.config.update( WEKO_ACCOUNTS_SHIB_LOGIN_ENABLED=True ) @@ -410,6 +817,15 @@ def test_shib_sp_login(client, redis_connect,mocker, db, users): client.post(url,data=form) mock_flash.assert_called_with("Missing SHIB_ATTRs!",category="error") + # parse_attribute is error(AMS) + with patch("weko_accounts.views.parse_attributes",return_value=("attr",True)): + mock_generate_ams_login_url = mocker.patch("weko_accounts.views.generate_ams_login_url", + return_value=make_response()) + client.post(url+"?next=ams",data=form) + mock_generate_ams_login_url.assert_called_once() + called_args, _ = mock_generate_ams_login_url.call_args + assert "Missing SHIB_ATTRs!" in called_args[0] + # Check if shib_eppn is not included in the blocked user list try: db.session.add(AdminSettings( @@ -418,7 +834,7 @@ def test_shib_sp_login(client, redis_connect,mocker, db, users): settings='{"blocked_ePPNs": ["ePPN1", "ePPN2", "ePPN3", "ePPN5", "ePPP*"]}' )) db.session.commit() - except Exception as e: + except Exception: db.session.rollback() raise finally: @@ -432,7 +848,16 @@ def test_shib_sp_login(client, redis_connect,mocker, db, users): } client.post(url,data=form) mock_flash.assert_called_with("Failed to login.",category="error") - mock_redirect_ = mocker.patch("weko_accounts.views._redirect_method",return_value=make_response()) + mock_redirect_ = mocker.patch("weko_accounts.views._redirect_method", + return_value=make_response()) + + # Match with blocked user(AMS) + mock_generate_ams_login_url = mocker.patch("weko_accounts.views.generate_ams_login_url", + return_value=make_response()) + client.post(url+"?next=ams",data=form) + mock_generate_ams_login_url.assert_called_once() + called_args, _ = mock_generate_ams_login_url.call_args + assert "Login is blocked." in called_args[0] # Match found with a blocked user from the wildcard mock_flash = mocker.patch("weko_accounts.views.flash") @@ -442,7 +867,14 @@ def test_shib_sp_login(client, redis_connect,mocker, db, users): } client.post(url,data=form) mock_flash.assert_called_with("Failed to login.",category="error") - mock_redirect_ = mocker.patch("weko_accounts.views._redirect_method",return_value=make_response()) + + # Match found with a blocked user from the wildcard(AMS) + mock_generate_ams_login_url = mocker.patch("weko_accounts.views.generate_ams_login_url", + return_value=make_response()) + client.post(url+"?next=ams",data=form) + mock_generate_ams_login_url.assert_called_once() + called_args, _ = mock_generate_ams_login_url.call_args + assert "Login is blocked." in called_args[0] # Not a blocked user form = { @@ -450,17 +882,24 @@ def test_shib_sp_login(client, redis_connect,mocker, db, users): "eppn":"test_eppn" } + mock_redirect_ = mocker.patch("weko_accounts.views._redirect_method", + return_value=make_response()) # WEKO_ACCOUNTS_SHIB_BIND_GAKUNIN_MAP_GROUPSがTrueの場合のテスト current_app.config.update( WEKO_ACCOUNTS_SHIB_BIND_GAKUNIN_MAP_GROUPS=True ) - mock_sync_shib_gakunin_map_groups = mocker.patch("weko_accounts.views.sync_shib_gakunin_map_groups", return_value=None) + mock_sync_shib_gakunin_map_groups = \ + mocker.patch("weko_accounts.views.sync_shib_gakunin_map_groups", + return_value=None) client.post(url, data=form) mock_sync_shib_gakunin_map_groups.assert_called_once() # sync_shib_gakunin_map_groupsが例外をスローする場合のテスト - mock_sync_shib_gakunin_map_groups = mocker.patch("weko_accounts.views.sync_shib_gakunin_map_groups", side_effect=Exception("test_exception")) - mock_redirect_method = mocker.patch("weko_accounts.views._redirect_method", return_value=make_response()) + mock_sync_shib_gakunin_map_groups = mocker.patch( + "weko_accounts.views.sync_shib_gakunin_map_groups", + side_effect=Exception("test_exception")) + mock_redirect_method = mocker.patch("weko_accounts.views._redirect_method", + return_value=make_response()) res = client.post(url, data=form) mock_redirect_method.assert_called_once() assert res.status_code == 200 # _redirect_methodが呼び出されることを確認 @@ -474,22 +913,61 @@ def test_shib_sp_login(client, redis_connect,mocker, db, users): mock_sync_shib_gakunin_map_groups.assert_not_called() # shib_user.get_relation_info is None - with patch("weko_accounts.views.ShibUser.get_relation_info",return_value=None)\ - and patch("weko_accounts.views.redirect",return_value=make_response()): + with patch("weko_accounts.views.ShibUser.get_relation_info", + return_value=None)\ + and patch("weko_accounts.views.redirect", + return_value=make_response()): res = client.post(url,data=form) assert res.status_code == 200 assert res.data.decode() == "/weko/shib/login?Shib-Session-ID=1111&next=%2F" with client.session_transaction() as session: assert 'shib_session_id' not in session # shib_user.get_relation_info is not None - with patch("weko_accounts.views.ShibUser.get_relation_info",return_value="chib_user")\ - and patch("weko_accounts.views.redirect",return_value=make_response()): + with patch("weko_accounts.views.ShibUser.get_relation_info", + return_value="chib_user")\ + and patch("weko_accounts.views.redirect", + return_value=make_response()): + res = client.post(url,data=form) + assert res.status_code == 200 + assert res.data.decode() == "/weko/shib/login?Shib-Session-ID=1111&next=%2F" + with client.session_transaction() as session: + assert 'shib_session_id' not in session + + # test without blocked_user_settings + AdminSettings.query.filter_by(id=11).delete() + db.session.commit() + with patch("weko_accounts.views.ShibUser.get_relation_info", + return_value=None)\ + and patch("weko_accounts.views.redirect", + return_value=make_response()): res = client.post(url,data=form) assert res.status_code == 200 assert res.data.decode() == "/weko/shib/login?Shib-Session-ID=1111&next=%2F" with client.session_transaction() as session: assert 'shib_session_id' not in session + # test with blocked_user_setting dict + db.session.add(AdminSettings( + id=11, + name="blocked_user_settings", + settings={"blocked_ePPNs": ["ePPN1", "ePPN2", "ePPN3", "ePPN5", "ePPP*"]} + )) + db.session.commit() + mock_flash = mocker.patch("weko_accounts.views.flash") + form_blocked = { + "Shib-Session-ID":"1111", + "eppn":"ePPN3" + } + client.post(url,data=form_blocked) + mock_flash.assert_called_with("Failed to login.",category="error") + AdminSettings.query.filter_by(id=11).delete() + db.session.add(AdminSettings( + id=11, + name="blocked_user_settings", + settings='{"blocked_ePPNs": ["ePPN1", "ePPN2", "ePPN3", "ePPN5", "ePPP*"]}' + )) + db.session.commit() + current_app.config.update( WEKO_ACCOUNTS_SHIB_LOGIN_ENABLED=True, WEKO_ACCOUNTS_SKIP_CONFIRMATION_PAGE=True @@ -522,10 +1000,25 @@ def test_shib_sp_login(client, redis_connect,mocker, db, users): # raise BaseException with patch("weko_accounts.views.flash",side_effect=BaseException("test_error"))\ - and patch("weko_accounts.views._redirect_method",return_value=make_response()) as mock_redirect_: + and patch("weko_accounts.views._redirect_method", + return_value=make_response()) as mock_redirect_: res = client.post(url,data={}) mock_redirect_.assert_called_once() + # raise BaseException(AMS) + mock_generate_ams_login_url = mocker.patch("weko_accounts.views.generate_ams_login_url", + return_value=make_response()) + with patch("weko_accounts.views.RedisConnection",side_effect=BaseException("test_error")): + form = { + "Shib-Session-ID":"1111", + "eppn":"test_eppn" + } + res = client.post(url+"?next=ams",data=form) + mock_generate_ams_login_url.assert_called_once() + called_args, _ = mock_generate_ams_login_url.call_args + assert "Server error has occurred. Please contact server " \ + "administrator." in called_args[0] + # all attributes have value and some shibboleth_user records don't have target eppn current_app.config.update( WEKO_ACCOUNTS_SHIB_LOGIN_ENABLED=True, @@ -737,7 +1230,8 @@ def test_shib_stub_login(client,mocker): WEKO_ACCOUNTS_SHIB_IDP_LOGIN_ENABLED=False ) # WEKO_ACCOUNTS_SHIB_IDP_LOGIN_ENABLED is true - mock_render_template = mocker.patch("weko_accounts.views.render_template",return_value=make_response()) + mock_render_template = mocker.patch("weko_accounts.views.render_template", + return_value=make_response()) res = client.get(url) mock_render_template.assert_called_with( 'weko_accounts/login_shibuser_pattern_1.html', diff --git a/modules/weko-accounts/weko_accounts/config.py b/modules/weko-accounts/weko_accounts/config.py index bf7d1c00ae..4ced5666e3 100644 --- a/modules/weko-accounts/weko_accounts/config.py +++ b/modules/weko-accounts/weko_accounts/config.py @@ -65,6 +65,8 @@ WEKO_ACCOUNTS_SHIB_IDP_LOGIN_URL = '{}secure/login.py' """Login proxy URL.""" +WEKO_ACCOUNTS_SHIB_AMS_LOGIN_URL = '{}ams/login' + WEKO_ACCOUNTS_SSO_ATTRIBUTE_MAP = { 'SHIB_ATTR_EPPN': (False, 'shib_eppn'), # 'SHIB_ATTR_LOGIN_ID': (False, 'shib_uid'), @@ -264,4 +266,4 @@ """Disable user registration via WEKO-Accounts.""" SECURITY_RECOVERABLE = False -"""Disable password recovery via WEKO-Accounts.""" \ No newline at end of file +"""Disable password recovery via WEKO-Accounts.""" diff --git a/modules/weko-accounts/weko_accounts/views.py b/modules/weko-accounts/weko_accounts/views.py index a26e313928..23247701fa 100644 --- a/modules/weko-accounts/weko_accounts/views.py +++ b/modules/weko-accounts/weko_accounts/views.py @@ -143,7 +143,7 @@ def _adjust_shib_admin_DB(): db.session.commit() -def _redirect_method(has_next=False): +def _redirect_method(has_next=False, ams_error=None): """Redirect method for instance login to IdP.""" shib_login = current_app.config['WEKO_ACCOUNTS_SHIB_LOGIN_ENABLED'] shib_login_url = current_app.config['WEKO_ACCOUNTS_SHIB_IDP_LOGIN_URL'] @@ -151,7 +151,13 @@ def _redirect_method(has_next=False): idp_login_inst = current_app.config[ 'WEKO_ACCOUNTS_SHIB_INST_LOGIN_DIRECTLY_ENABLED'] - if shib_login and idp_login and idp_login_inst: + if ams_error: + shib_ams_login_url = current_app.config['WEKO_ACCOUNTS_SHIB_AMS_LOGIN_URL'] + ams_url = shib_ams_login_url.format(request.url_root) + encoded_error = quote_plus(str(ams_error), encoding='utf-8', errors='replace') + url = f'{ams_url}?error={encoded_error}' + return redirect(url) + elif shib_login and idp_login and idp_login_inst: url = shib_login_url.format(request.url_root) if has_next: url += '?next=' + request.full_path @@ -162,6 +168,28 @@ def _redirect_method(has_next=False): next=request.full_path if has_next else None)) +def generate_ams_login_url(ams_error): + """ + Generate a redirect URL for the AMS login page with error details. + + The returned URL starts with a '/'. + + Args: + ams_error (str): Error message for the AMS login page to include + in the redirect URL. + + Returns: + str: URL for the AMS login page including the error + information as a query parameter. + """ + shib_ams_login_url = current_app.config['WEKO_ACCOUNTS_SHIB_AMS_LOGIN_URL'] + ams_url = shib_ams_login_url.format('/') + encoded_error = quote_plus( + str(ams_error), encoding='utf-8', errors='replace') + url = f'{ams_url}?error={encoded_error}' + return url + + @blueprint.route('/') def index(): """Render a basic view.""" @@ -176,29 +204,42 @@ def shib_auto_login(): :return: next url """ + ams_login = False try: is_auto_bind = False shib_session_id = request.args.get('Shib-Session-ID', None) - session['next'] = request.args.get('next', '/') - + next_value = request.args.get('next') + if next_value != 'ams': + next_value = session.get('next', '/') + session['next'] = next_value + ams_login = next_value == 'ams' if not shib_session_id: shib_session_id = session['shib_session_id'] is_auto_bind = True if not shib_session_id: - return _redirect_method() + if ams_login: + return _redirect_method(True, ams_error=_('Missing Shib-Session-ID!')) + else: + return _redirect_method() redis_connection = RedisConnection() datastore = redis_connection.connection(db=current_app.config['CACHE_REDIS_DB'], kv = True) cache_key = current_app.config[ 'WEKO_ACCOUNTS_SHIB_CACHE_PREFIX'] + shib_session_id if not datastore.redis.exists(cache_key): - return _redirect_method() + if ams_login: + return _redirect_method(True, ams_error=_('Missing SHIB_CACHE_PREFIX!')) + else: + return _redirect_method() cache_val = datastore.get(cache_key) if not cache_val: datastore.delete(cache_key) - return _redirect_method() + if ams_login: + return _redirect_method(True, ams_error=_('Missing SHIB_ATTR!')) + else: + return _redirect_method() cache_val = json.loads(str(cache_val, encoding='utf-8')) shib_user = ShibUser(cache_val) @@ -212,8 +253,11 @@ def shib_auto_login(): if error: datastore.delete(cache_key) current_app.logger.error(error) - flash(error, category='error') - return _redirect_method() + if ams_login: + return _redirect_method(True, ams_error=error) + else: + flash(error, category='error') + return _redirect_method() if shib_user.shib_user: shib_user.shib_user_login() @@ -225,7 +269,10 @@ def shib_auto_login(): target_key=shib_user.user.id, remarks="Shibboleth login" ) - return redirect(session['next'] if 'next' in session else '/') + if ams_login: + return redirect('/?next=ams') + else: + return redirect(session['next'] if 'next' in session else '/') except BaseException: db.session.rollback() current_app.logger.error("Unexpected error: {}".format(sys.exc_info())) @@ -235,6 +282,9 @@ def shib_auto_login(): operation="LOGIN", remarks=tb_info[0] ) + if ams_login: + return _redirect_method(True, ams_error=_( + 'Server error has occurred. Please contact server administrator.')) return abort(400) @@ -244,15 +294,25 @@ def confirm_user(): :return: """ + ams_login = False try: + next_value = session['next'] if 'next' in session else '' + if next_value == 'ams': + ams_login = True if request.form.get('csrf_random', '') != session['csrf_random']: - flash('csrf_random', category='error') - return _redirect_method() + if ams_login: + return _redirect_method(True, ams_error=_('csrf_random')) + else: + flash('csrf_random', category='error') + return _redirect_method() shib_session_id = session['shib_session_id'] if not shib_session_id: - flash('shib_session_id', category='error') - return _redirect_method() + if ams_login: + return _redirect_method(True, ams_error=_('Missing Shib-Session-ID!')) + else: + flash('shib_session_id', category='error') + return _redirect_method() redis_connection = RedisConnection() datastore = redis_connection.connection(db=current_app.config['CACHE_REDIS_DB'], kv = True) @@ -260,34 +320,49 @@ def confirm_user(): 'WEKO_ACCOUNTS_SHIB_CACHE_PREFIX'] + shib_session_id if not datastore.redis.exists(cache_key): - flash('cache_key', category='error') - return _redirect_method() + if ams_login: + return _redirect_method(True, ams_error=_('Missing SHIB_CACHE_PREFIX!')) + else: + flash('cache_key', category='error') + return _redirect_method() cache_val = datastore.get(cache_key) if not cache_val: - flash('cache_val', category='error') - datastore.delete(cache_key) - return _redirect_method() + if ams_login: + return _redirect_method(True, ams_error=_('Missing SHIB_ATTR!')) + else: + flash('cache_val', category='error') + datastore.delete(cache_key) + return _redirect_method() cache_val = json.loads(str(cache_val, encoding='utf-8')) shib_user = ShibUser(cache_val) account = request.form.get('WEKO_ATTR_ACCOUNT', None) password = request.form.get('WEKO_ATTR_PWD', None) if not shib_user.check_weko_user(account, password): - flash('check_weko_user', category='error') - datastore.delete(cache_key) - return _redirect_method() + if ams_login: + return _redirect_method(True, ams_error=_('There is no user information.')) + else: + flash('check_weko_user', category='error') + datastore.delete(cache_key) + return _redirect_method() if not shib_user.bind_relation_info(account): - flash('FAILED bind_relation_info!', category='error') - return _redirect_method() + if ams_login: + return _redirect_method(True, ams_error=_('FAILED bind_relation_info!')) + else: + flash('FAILED bind_relation_info!', category='error') + return _redirect_method() error = shib_user.check_in() if error: datastore.delete(cache_key) - flash(error, category='error') - return _redirect_method() + if ams_login: + return _redirect_method(True, ams_error=error) + else: + flash(error, category='error') + return _redirect_method() if shib_user.shib_user: shib_user.shib_user_login() @@ -297,7 +372,10 @@ def confirm_user(): target_key=shib_user.user.id, remarks="Shibboleth login" ) - return redirect(session['next'] if 'next' in session else '/') + if ams_login: + return redirect('/?next=ams') + else: + return redirect(session['next'] if 'next' in session else '/') except BaseException: current_app.logger.error("Unexpected error: {}".format(sys.exc_info())) exec_info = sys.exc_info() @@ -306,6 +384,9 @@ def confirm_user(): operation="LOGIN", remarks=tb_info[0] ) + if ams_login: + return _redirect_method(True, ams_error=_( + 'Server error has occurred. Please contact server administrator.')) return abort(400) @@ -315,12 +396,20 @@ def confirm_user_without_page(): :return: """ + ams_login = False try: + next_value = request.args.get('next', '') + if next_value == 'ams': + ams_login = True + # get shib_session_id from session shib_session_id = request.args.get('Shib-Session-ID', None) if not shib_session_id: - flash('shib_session_id', category='error') - return _redirect_method() + if ams_login: + return _redirect_method(True, ams_error=_('Missing Shib-Session-ID!')) + else: + flash('shib_session_id', category='error') + return _redirect_method() # get cache from redis redis_connection = RedisConnection() @@ -330,38 +419,56 @@ def confirm_user_without_page(): # check cache if not datastore.redis.exists(cache_key): - flash('cache_key', category='error') - return _redirect_method() + if ams_login: + return _redirect_method(True, ams_error=_('Missing SHIB_CACHE_PREFIX!')) + else: + flash('cache_key', category='error') + return _redirect_method() cache_val = datastore.get(cache_key) if not cache_val: - flash('cache_val', category='error') - datastore.delete(cache_key) - return _redirect_method() + if ams_login: + return _redirect_method(True, ams_error=_('Missing SHIB_ATTR!')) + else: + flash('cache_val', category='error') + datastore.delete(cache_key) + return _redirect_method() cache_val = json.loads(str(cache_val, encoding='utf-8')) shib_user = ShibUser(cache_val) # bind relation info if not shib_user.bind_relation_info(cache_val.get('shib_mail')): - flash('FAILED bind_relation_info!', category='error') datastore.delete(cache_key) - return _redirect_method() + if ams_login: + return _redirect_method(True, ams_error=_('FAILED bind_relation_info!')) + else: + flash('FAILED bind_relation_info!', category='error') + return _redirect_method() # check in error = shib_user.check_in() if error: datastore.delete(cache_key) - flash(error, category='error') - return _redirect_method() + if ams_login: + return _redirect_method(True, ams_error=error) + else: + flash(error, category='error') + return _redirect_method() if shib_user.shib_user: shib_user.shib_user_login() datastore.delete(cache_key) - return redirect(request.args.get('next', '/')) + if ams_login: + return redirect('/?next=ams') + else: + return redirect(request.args.get('next', '/')) except BaseException: current_app.logger.error("Unexpected error: {}".format(sys.exc_info())) + if ams_login: + return _redirect_method(True, ams_error=_( + 'Server error has occurred. Please contact server administrator.')) return abort(400) @@ -371,14 +478,19 @@ def shib_login(): :return: confirm user page when relation is empty """ + ams_login = False try: shib_session_id = request.args.get('Shib-Session-ID', None) session['next'] = request.args.get('next', '/') - + if session['next'] == 'ams': + ams_login = True if not shib_session_id: - current_app.logger.error(_("Missing Shib-Session-ID!")) - flash(_("Missing Shib-Session-ID!"), category='error') - return _redirect_method() + current_app.logger.error(_('Missing Shib-Session-ID!')) + if ams_login: + return _redirect_method(True, ams_error=_('Missing Shib-Session-ID!')) + else: + flash(_('Missing Shib-Session-ID!'), category='error') + return _redirect_method() redis_connection = RedisConnection() datastore = redis_connection.connection(db=current_app.config['CACHE_REDIS_DB'], kv = True) @@ -386,17 +498,23 @@ def shib_login(): 'WEKO_ACCOUNTS_SHIB_CACHE_PREFIX'] + shib_session_id if not datastore.redis.exists(cache_key): - current_app.logger.error(_("Missing SHIB_CACHE_PREFIX!")) - flash(_("Missing SHIB_CACHE_PREFIX!"), category='error') - return _redirect_method() + current_app.logger.error(_('Missing SHIB_CACHE_PREFIX!')) + flash(_('Missing SHIB_CACHE_PREFIX!'), category='error') + if ams_login: + return _redirect_method(True, ams_error=_('Missing SHIB_CACHE_PREFIX!')) + else: + return _redirect_method() cache_val = datastore.get(cache_key) if not cache_val: - current_app.logger.error(_("Missing SHIB_ATTR!")) - flash(_("Missing SHIB_ATTR!"), category='error') + current_app.logger.error(_('Missing SHIB_ATTR!')) datastore.delete(cache_key) - return _redirect_method() + if ams_login: + return _redirect_method(True, ams_error=_('Missing SHIB_ATTR!')) + else: + flash(_('Missing SHIB_ATTR!'), category='error') + return _redirect_method() cache_val = json.loads(str(cache_val, encoding='utf-8')) session['shib_session_id'] = shib_session_id @@ -412,6 +530,9 @@ def shib_login(): ) except BaseException: current_app.logger.error("Unexpected error: {}".format(sys.exc_info())) + if ams_login: + return _redirect_method(True, ams_error=_( + 'Server error has occurred. Please contact server administrator.')) return abort(400) def find_user_by_email(shib_attributes): @@ -432,7 +553,9 @@ def shib_sp_login(): _shib_username_config = current_app.config[ 'WEKO_ACCOUNTS_SHIB_ALLOW_USERNAME_INST_EPPN'] next = request.args.get('next', '/') - + ams_login = False + if next == 'ams': + ams_login = True try: # WEKO_ACCOUNTS_SHIB_BIND_GAKUNIN_MAP_GROUPSがTrueのときの処理 if current_app.config['WEKO_ACCOUNTS_SHIB_BIND_GAKUNIN_MAP_GROUPS']: @@ -440,8 +563,11 @@ def shib_sp_login(): shib_session_id = request.form.get('Shib-Session-ID', None) if not shib_session_id and not _shib_enable: - flash(_("Missing Shib-Session-ID!"), category='error') - return redirect(url_for_security('login')) + if ams_login: + return generate_ams_login_url(_('Missing Shib-Session-ID!')) + else: + flash(_('Missing Shib-Session-ID!'), category='error') + return redirect(url_for_security('login')) shib_attr, error = parse_attributes() @@ -449,8 +575,11 @@ def shib_sp_login(): if error or not ( shib_attr.get('shib_eppn', None) or _shib_username_config and shib_attr.get('shib_user_name')): - flash(_("Missing SHIB_ATTRs!"), category='error') - return _redirect_method() + if ams_login: + return generate_ams_login_url(_('Missing SHIB_ATTRs!')) + else: + flash(_('Missing SHIB_ATTRs!'), category='error') + return _redirect_method() # Check if shib_eppn is not included in the blocked user list if AdminSettings.query.filter_by(name='blocked_user_settings').first(): @@ -468,8 +597,11 @@ def _wildcard_to_regex(pattern): blocked = any(_wildcard_to_regex(pattern).match(shib_eppn) or pattern == shib_eppn for pattern in block_user_list) if blocked: - flash(_("Failed to login."), category='error') - return _redirect_method() + if ams_login: + return generate_ams_login_url(_('Login is blocked.')) + else: + flash(_('Failed to login.'), category='error') + return _redirect_method() # Redis connection redis_connection = RedisConnection() @@ -509,7 +641,11 @@ def _wildcard_to_regex(pattern): return url_for(next_url, **query_string) except BaseException: current_app.logger.error("Unexpected error: {}".format(sys.exc_info())) - return _redirect_method() + if ams_login: + return generate_ams_login_url( + _('Server error has occurred. Please contact server administrator.')) + else: + return _redirect_method() @blueprint.route('/shib/sp/login', methods=['GET']) diff --git a/modules/weko-admin/tests/test_utils.py b/modules/weko-admin/tests/test_utils.py index 97d0fa57da..8a8abf686b 100755 --- a/modules/weko-admin/tests/test_utils.py +++ b/modules/weko-admin/tests/test_utils.py @@ -2,7 +2,7 @@ import uuid from mock import patch from datetime import datetime, timedelta -from flask import current_app, Markup +from flask import current_app, Markup, Flask from io import StringIO import pytest import json @@ -1927,7 +1927,7 @@ def test_update_restricted_access(admin_settings,mocker): result = update_restricted_access(data) mock_called.assert_not_called() mock_called.reset_mock() - + data = { "edit_mail_templates_enable": False } @@ -2171,6 +2171,252 @@ def test_create_facet_search_query(facet_search_settings): assert has_permission == test_has_permission assert no_permission == test_no_permission +class DummyFacet: + def __init__(self, name_en, mapping, aggregations): + self.name_en = name_en + self.mapping = mapping + self.aggregations = aggregations + +# .tox/c1/bin/pytest --cov=weko_admin tests/test_utils.py::test_create_aggregations_branch -vv -s --cov-branch --cov-report=term --basetemp=/code/modules/weko-admin/.tox/c1/tmp +def test_create_aggregations_branch(mocker): + ACCESS_RIGHTS_QUERY_TEMPLATE = { + "open access": { + "bool": { + "should": [ + {"term": {"accessRights": "open access"}}, + { + "bool": { + "must": [ + {"term": {"accessRights": "embargoed access"}}, + {"nested": {"path": "content", "query": {"exists": {"field": "content.accessrole.raw"}}}}, + { + "bool": { + "must_not": [ + { + "nested": { + "path": "content", + "query": { + "bool": { + "must_not": [ + {"term": {"content.accessrole.raw": "open_access"}}, + { + "bool": { + "must": [ + {"term": {"content.accessrole.raw": "open_date"}}, + {"range": {"content.date.dateValue.raw": {"lte": "@date"}}} + ] + } + } + ] + } + } + } + } + ] + } + } + ] + } + } + ] + } + }, + "embargoed access": { + "bool": { + "must": [ + {"term": {"accessRights": "embargoed access"}}, + { + "bool": { + "should": [ + { + "nested": { + "path": "content", + "query": { + "bool": { + "must": [ + {"term": {"content.accessrole.raw": "open_date"}}, + {"range": {"content.date.dateValue.raw": {"gt": "@date"}}} + ] + } + } + } + }, + { + "bool": { + "must": [ + {"nested": { + "path": "content", + "query": {"term": {"content.accessrole.raw": "open_no"}} + }} + ], + "must_not": [ + {"nested": { + "path": "content", + "query": {"term": {"content.accessrole.raw": "open_login"}} + }} + ] + } + }, + { + "bool": { + "must_not": [ + {"nested": { + "path": "content", + "query": {"exists": {"field": "content.accessrole.raw"}} + }} + ] + } + } + ] + } + } + ], + "must_not": [ + { + "nested": { + "path": "content", + "query": {"term": {"content.accessrole.raw": "open_restricted"}} + } + } + ] + } + }, + "restricted access": { + "bool": { + "should": [ + {"term": {"accessRights": "restricted access"}}, + { + "bool": { + "must": [ + {"term": {"accessRights": "embargoed access"}}, + { + "nested": { + "path": "content", + "query": { + "term": {"content.accessrole.raw": "open_login"} + } + } + }, + { + "bool": { + "must_not": [ + { + "nested": { + "path": "content", + "query": { + "bool": { + "must": [ + {"term": {"content.accessrole.raw": "open_date"}}, + {"range": {"content.date.dateValue.raw": {"gt": "@date"}}} + ] + } + } + } + } + ] + } + } + ] + } + }, + { + "bool": { + "must": [ + {"term": {"accessRights": "embargoed access"}}, + { + "nested": { + "path": "content", + "query": { + "term": {"content.accessrole.raw": "open_restricted"} + } + } + } + ] + } + } + ] + } + }, + "metadata only access": { + "bool": { + "must": [ + {"term": {"accessRights": "metadata only access"}} + ] + } + } + } + # 1. ACCESSRIGHTS_FIX_ENABLED=False + app = Flask(__name__) + app.config["SEARCH_UI_SEARCH_INDEX"] = "testidx" + app.config["WEKO_SEARCH_FIX_ACCESSRIGHTS"] = False + mocker.patch("weko_admin.models.FacetSearchSetting.get_activated_facets", return_value=[DummyFacet("type", "type", [])]) + with app.app_context(): + has_permission, no_permission = create_facet_search_query() + aggs = has_permission["testidx"]["aggs"] + assert "new_accessRights" not in aggs + + # 2. ACCESSRIGHTS_FIX_ENABLED=True, no accessRights facet + app = Flask(__name__) + app.config["SEARCH_UI_SEARCH_INDEX"] = "testidx" + app.config["WEKO_SEARCH_FIX_ACCESSRIGHTS"] = True + mocker.patch("weko_admin.models.FacetSearchSetting.get_activated_facets", return_value=[DummyFacet("type", "type", [])]) + with app.app_context(): + has_permission, no_permission = create_facet_search_query() + aggs = has_permission["testidx"]["aggs"] + assert "new_accessRights" not in aggs + + # 3. ACCESSRIGHTS_FIX_ENABLED=True, with accessRights facet + app = Flask(__name__) + app.config["SEARCH_UI_SEARCH_INDEX"] = "testidx" + app.config["WEKO_SEARCH_FIX_ACCESSRIGHTS"] = True + app.config["WEKO_ACCESS_RIGHTS_CHOICES"] = [ + "open access", "embargoed access", "restricted access", "metadata only access" + ] + mocker.patch("weko_admin.models.FacetSearchSetting.get_activated_facets", return_value=[ + DummyFacet("accessRights", "accessRights", [ + {"agg_mapping": "publish_status", "agg_value": 0} + ]) + ]) + with app.app_context(): + has_permission, no_permission = create_facet_search_query() + aggs = has_permission["testidx"]["aggs"] + assert "new_accessRights" in aggs + filters = aggs["new_accessRights"]["filters"]["filters"] + for access_type in app.config["WEKO_ACCESS_RIGHTS_CHOICES"]: + assert access_type in filters + assert "bool" in filters[access_type] + import copy + for access_type in app.config["WEKO_ACCESS_RIGHTS_CHOICES"]: + template = copy.deepcopy(ACCESS_RIGHTS_QUERY_TEMPLATE[access_type]) + actual_bool = filters[access_type]["bool"] + # Replace @date in the template with today's date + def replace_date(obj, today): + if isinstance(obj, dict): + for k, v in obj.items(): + if isinstance(v, str) and v == "@date": + obj[k] = today + else: + replace_date(v, today) + elif isinstance(obj, list): + for v in obj: + replace_date(v, today) + today = datetime.now().strftime("%Y-%m-%d") + replace_date(template, today) + # After the publish_status term condition, check if the template structure matches + must_list = actual_bool.get("must", []) + access_query = must_list[2] if len(must_list) > 2 else must_list[-1] + assert access_query == template + + # When facet mapping includes “fields.raw” + app = Flask(__name__) + app.config["SEARCH_UI_SEARCH_INDEX"] = "testidx" + mocker.patch("weko_admin.models.FacetSearchSetting.get_activated_facets", return_value=[ + DummyFacet("raw_test", "test.fields.raw", []) + ]) + with app.app_context(): + has_permission, no_permission = create_facet_search_query() + post_filters = has_permission["testidx"]["post_filters"] + assert post_filters["raw_test"] == "test.raw" # def store_facet_search_query_in_redis(): # .tox/c1/bin/pytest --cov=weko_admin tests/test_utils.py::test_store_facet_search_query_in_redis -vv -s --cov-branch --cov-report=term --basetemp=/code/modules/weko-admin/.tox/c1/tmp @@ -2189,7 +2435,12 @@ def test_store_facet_search_query_in_redis(mocker): 'aggs': {'Data Language': {'aggs': {'Data Language': {'terms': {'field': 'language','size': 1000}}}, 'filter': {'bool': {'must': [{'term': {'publish_status': '0'}}]}}}, 'Data Type': {'aggs': {'Data Type': {'terms': {'field': 'description.value','size': 1000}}}, - 'filter': {'bool': {'must': [{'term': {'description.descriptionType': 'Other'}},{'term': {'publish_status': '0'}}]}}}}, + 'filter': {'bool': {'must': [{'term': {'description.descriptionType': 'Other'}},{'term': {'publish_status': '0'}}]}}}, + 'Time Period(s)': {'aggs': {'Time Period(s)': {'terms':{'field': 'temporal','size':1000}}}, + 'filter':{'bool':{'must':[{'term':{'publish_status':'0'}}]}}}, + 'raw_test': {'aggs': {'raw_test': {'terms':{'field': 'fields.raw','size':1000}}}, + 'filter':{'bool':{'must':[{'term':{'publish_status':'0'}}]}}} + }, 'post_filters': {'Data Language': 'language', 'Data Type': 'description.value'}}, } diff --git a/modules/weko-admin/weko_admin/config.py b/modules/weko-admin/weko_admin/config.py index 6cc81bebc2..11d67a15b9 100644 --- a/modules/weko-admin/weko_admin/config.py +++ b/modules/weko-admin/weko_admin/config.py @@ -1113,7 +1113,30 @@ 'mappingName':'', 'item_value':{'1': {'path': {'type': '', 'coordinates': ''}, 'path_type': {'type': 'json', 'coordinates': 'json'}} } - } + }, + { + "id":"accessrights", + "contents":"", + "contents_value":{"en":"Access Rights","ja":"アクセス権"}, + "useable_status":True, + "mapping":[ + "embargoed access", + "metadata only access", + "open access", + "restricted access", + ], + "check_val":[ + {"id":"embargoed access","contents":"embargoed access","checkStus":False}, + {"id":"metadata only access","contents":"metadata only access","checkStus":False}, + {"id":"open access","contents":"open access","checkStus":False}, + {"id":"restricted access","contents":"restricted access","checkStus":False}, + ], + "default_display":True, + "inputType":"checkbox_list", + "inputVal":"", + "mappingFlg":False, + "mappingName":"" + } ] } @@ -1335,7 +1358,7 @@ """Default restricted access settings.""" WEKO_ADMIN_RESTRICTED_ACCESS_MAX_INTEGER = 9999999 -"""max value of expiration_date and download_limit. +"""max value of expiration_date and download_limit. Any more than this and the datetime may overflow. """ WEKO_ADMIN_ITEMS_PER_PAGE_USAGE_REPORT_REMINDER = 25 diff --git a/modules/weko-admin/weko_admin/utils.py b/modules/weko-admin/weko_admin/utils.py index dc9e4a1194..838f1a3fc2 100755 --- a/modules/weko-admin/weko_admin/utils.py +++ b/modules/weko-admin/weko_admin/utils.py @@ -25,6 +25,7 @@ import os import traceback import zipfile +import copy from datetime import datetime, timedelta from io import BytesIO, StringIO from typing import Dict, Optional, Tuple, Union @@ -2198,12 +2199,239 @@ def create_aggregations(facets): val = facet.mapping # Update agg query for has permission. agg_has_permission_query.update( - create_agg_by_aggregations(facet.aggregations, key, val)) + create_agg_by_aggregations(facet.aggregations, key, val) + ) # Update agg query for no permission. facet.aggregations.append( - {'agg_mapping': 'publish_status', 'agg_value': PublishStatus.PUBLIC.value}) + { + 'agg_mapping': 'publish_status', + 'agg_value': PublishStatus.PUBLIC.value + } + ) agg_no_permission_query.update( - create_agg_by_aggregations(facet.aggregations, key, val)) + create_agg_by_aggregations(facet.aggregations, key, val) + ) + # Add aggregation conditions for accessRights + ACCESSRIGHTS_FIX_ENABLED = current_app.config.get( + "WEKO_SEARCH_FIX_ACCESSRIGHTS", False + ) + ACCESS_RIGHTS_CHOICES = current_app.config.get( + "WEKO_ACCESS_RIGHTS_CHOICES", + [ + "open access", + "embargoed access", + "restricted access", + "metadata only access", + ] + ) + ACCESS_RIGHTS_QUERY_TEMPLATE = { + "open access": { + "bool": { + "should": [ + {"term": {"accessRights": "open access"}}, + { + "bool": { + "must": [ + {"term": {"accessRights": "embargoed access"}}, + {"nested": {"path": "content", "query": {"exists": {"field": "content.accessrole.raw"}}}}, + { + "bool": { + "must_not": [ + { + "nested": { + "path": "content", + "query": { + "bool": { + "must_not": [ + {"term": {"content.accessrole.raw": "open_access"}}, + { + "bool": { + "must": [ + {"term": {"content.accessrole.raw": "open_date"}}, + {"range": {"content.date.dateValue.raw": {"lte": "@date"}}} + ] + } + } + ] + } + } + } + } + ] + } + } + ] + } + } + ] + } + }, + "embargoed access": { + "bool": { + "must": [ + {"term": {"accessRights": "embargoed access"}}, + { + "bool": { + "should": [ + { + "nested": { + "path": "content", + "query": { + "bool": { + "must": [ + {"term": {"content.accessrole.raw": "open_date"}}, + {"range": {"content.date.dateValue.raw": {"gt": "@date"}}} + ] + } + } + } + }, + { + "bool": { + "must": [ + {"nested": { + "path": "content", + "query": {"term": {"content.accessrole.raw": "open_no"}} + }} + ], + "must_not": [ + {"nested": { + "path": "content", + "query": {"term": {"content.accessrole.raw": "open_login"}} + }} + ] + } + }, + { + "bool": { + "must_not": [ + {"nested": { + "path": "content", + "query": {"exists": {"field": "content.accessrole.raw"}} + }} + ] + } + } + ] + } + } + ], + "must_not": [ + { + "nested": { + "path": "content", + "query": {"term": {"content.accessrole.raw": "open_restricted"}} + } + } + ] + } + }, + "restricted access": { + "bool": { + "should": [ + {"term": {"accessRights": "restricted access"}}, + { + "bool": { + "must": [ + {"term": {"accessRights": "embargoed access"}}, + { + "nested": { + "path": "content", + "query": { + "term": {"content.accessrole.raw": "open_login"} + } + } + }, + { + "bool": { + "must_not": [ + { + "nested": { + "path": "content", + "query": { + "bool": { + "must": [ + {"term": {"content.accessrole.raw": "open_date"}}, + {"range": {"content.date.dateValue.raw": {"gt": "@date"}}} + ] + } + } + } + } + ] + } + } + ] + } + }, + { + "bool": { + "must": [ + {"term": {"accessRights": "embargoed access"}}, + { + "nested": { + "path": "content", + "query": { + "term": {"content.accessrole.raw": "open_restricted"} + } + } + } + ] + } + } + ] + } + }, + "metadata only access": { + "bool": { + "must": [ + {"term": {"accessRights": "metadata only access"}} + ] + } + } + } + def _replace_date(obj, now): + """Recursively replace @date with current date.""" + if isinstance(obj, dict): + for k, v in obj.items(): + if isinstance(v, str) and v == "@date": + obj[k] = now + else: + _replace_date(v, now) + elif isinstance(obj, list): + for v in obj: + _replace_date(v, now) + if ACCESSRIGHTS_FIX_ENABLED: + access_rights = next( + (facet for facet in facets if facet.mapping == "accessRights"), + None + ) + if access_rights: + now = datetime.now().strftime("%Y-%m-%d") + must = [ + dict(term={d["agg_mapping"]: d["agg_value"]}) + for d in access_rights.aggregations + ] + new_access_rights = { + "new_accessRights": { + "filters": { + "filters": {} + } + } + } + for access_type in ACCESS_RIGHTS_CHOICES: + query_template = copy.deepcopy( + ACCESS_RIGHTS_QUERY_TEMPLATE.get(access_type, {}) + ) + _replace_date(query_template, now) + must_copy = copy.deepcopy(must) + if query_template: + must_copy.append(query_template) + new_access_rights["new_accessRights"]["filters"]["filters"][ + access_type + ] = {"bool": {"must": must_copy}} + agg_has_permission_query.update(new_access_rights) + agg_no_permission_query.update(new_access_rights) return agg_has_permission_query, agg_no_permission_query def create_post_filters(facets): @@ -2224,6 +2452,11 @@ def create_post_filters(facets): agg_has_permission, agg_no_permission = create_aggregations( activated_facets) post_filters = create_post_filters(activated_facets) + ACCESSRIGHTS_FIX_ENABLED = current_app.config.get( + "WEKO_SEARCH_FIX_ACCESSRIGHTS", False + ) + if ACCESSRIGHTS_FIX_ENABLED and "new_accessRights" in agg_has_permission: + post_filters["new_accessRights"] = agg_has_permission["new_accessRights"] # Create facet search query for has permission. has_permission_query[search_index] = dict( aggs=agg_has_permission, @@ -2275,6 +2508,8 @@ def get_facet_search_query(has_permission=True): from weko_admin.utils import get_title_facets titles, order, uiTypes, isOpens, displayNumbers, searchConditions = get_title_facets() for k, v in post_filters.items(): + if k == "new_accessRights": + continue if v == 'temporal': # If the mapping name is [template], it is assumed to be a Filter to date_range1. post_filters.update({k: range_filter('date_range1', False, False)}) diff --git a/modules/weko-deposit/requirements2.txt b/modules/weko-deposit/requirements2.txt index 43d2bf48e9..b01f66293a 100644 --- a/modules/weko-deposit/requirements2.txt +++ b/modules/weko-deposit/requirements2.txt @@ -288,4 +288,4 @@ xmlschema==0.9.30 xmltodict==0.12.0 zipp==3.6.0 zope.interface==5.5.2 -pypdfium2==4.30.0 \ No newline at end of file +pypdfium2==4.30.0 diff --git a/modules/weko-deposit/tests/test_utils.py b/modules/weko-deposit/tests/test_utils.py index 130d61fba7..e16fda9f57 100644 --- a/modules/weko-deposit/tests/test_utils.py +++ b/modules/weko-deposit/tests/test_utils.py @@ -18,14 +18,14 @@ # Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, # MA 02111-1307, USA. -from weko_deposit.api import WekoDeposit -from weko_deposit.utils import update_pdf_contents_es, extract_text_from_pdf, extract_text_with_tika -from sqlalchemy.orm.exc import NoResultFound +import os import types + +import pytest +from sqlalchemy.orm.exc import NoResultFound from unittest.mock import patch, MagicMock -import uuid -from tests.helpers import create_record_with_pdf +from weko_deposit.utils import update_pdf_contents_es, extract_text_from_pdf, extract_text_with_tika # .tox/c1/bin/pytest --cov=weko_deposit tests/test_utils.py::test_update_pdf_contents_es_with_index_api -vv -s --cov-branch --cov-report=term --basetemp=/code/modules/weko-deposit/.tox/c1/tmp def test_update_pdf_contents_es(app, mocker): @@ -60,9 +60,6 @@ def get_pdf_info(self): raise NoResultFound() assert hasattr(dummy_trace, 'called') -import os - -import pytest # .tox/c1/bin/pytest --cov=weko_deposit tests/test_utils.py::test_extract_text_from_pdf -vv -s --cov-branch --cov-report=term --basetemp=/code/modules/weko-deposit/.tox/c1/tmp def test_extract_text_from_pdf(): filepath = os.path.join(os.path.dirname(__file__),"data","test_files","test_file_1.2M.pdf") @@ -94,21 +91,23 @@ def test_extract_text_with_tika(): data = extract_text_with_tika(filepath, 100) assert str(e.value) == "not exist tika jar file." - # error with subprocess - mock_run = MagicMock() - mock_run.returncode.return_value=1 - mock_run.stderr.decode.return_value="test_error" - with patch("weko_deposit.utils.subprocess.run", return_value=mock_run): - with pytest.raises(Exception) as e: - data = extract_text_with_tika(filepath, 100) - assert str(e.value) == "raise in tika: test_error" + mock_env_exist_tika = {"TIKA_JAR_FILE_PATH": "/code/tika/tika-app-2.6.0.jar"} + with patch.dict(os.environ, mock_env_exist_tika, clear=False): + # error with subprocess + mock_run = MagicMock() + mock_run.returncode.return_value=1 + mock_run.stderr.decode.return_value="test_error" + with patch("weko_deposit.utils.subprocess.run", return_value=mock_run): + with pytest.raises(Exception) as e: + data = extract_text_with_tika(filepath, 100) + assert str(e.value) == "raise in tika: test_error" - # file size > max_size - data = extract_text_with_tika(filepath, 50) - assert len(data.encode('utf-8')) < 50 - assert data == "これはテスト用のサンプルwordファイ" + # file size > max_size + data = extract_text_with_tika(filepath, 50) + assert len(data.encode('utf-8')) < 50 + assert data == "これはテスト用のサンプルwordファイ" - # file size <= max_size - data = extract_text_with_tika(filepath, 5000) - assert len(data.encode('utf-8')) > 50 - assert data == "これはテスト用のサンプルwordファイルです中身は特に意味がありません" + # file size <= max_size + data = extract_text_with_tika(filepath, 5000) + assert len(data.encode('utf-8')) > 50 + assert data == "これはテスト用のサンプルwordファイルです中身は特に意味がありません" diff --git a/modules/weko-index-tree/tests/test_rest.py b/modules/weko-index-tree/tests/test_rest.py index 0320996b6d..25d7e4d217 100644 --- a/modules/weko-index-tree/tests/test_rest.py +++ b/modules/weko-index-tree/tests/test_rest.py @@ -1438,3 +1438,14 @@ def run_delete_index_server_error(self, app, client_rest, auth_headers): with patch.object(Indexes, "delete", side_effect=SQLAlchemyError): response = client_rest.delete(url, headers=auth_headers) assert response.status_code == 500, f"{response.json}" + +# class GetIndex: +# .tox/c1/bin/pytest --cov=weko_index_tree tests/test_rest.py::TestGetIndex -vv -s --cov-branch --cov-report=term --cov-report=html --basetemp=/code/modules/weko_index_tree/.tox/c1/tmp --full-trace +class TestGetIndex: + # .tox/c1/bin/pytest --cov=weko_index_tree tests/test_rest.py::TestGetIndex::test_get_v1 -vv -s --cov-branch --cov-report=term --cov-report=html --basetemp=/code/modules/weko_index_tree/.tox/c1/tmp --full-trace + def test_get_v1(self, client_rest, users, test_indices, auth_headers_sysadmin): + res = client_rest.get('/v1/tree/index/1', headers=auth_headers_sysadmin) + assert res.status_code == 200 + data = json.loads(res.get_data()) + assert data['index']['name'] == 'Test index 1' + assert data['index']['public_date'] == '20220101' diff --git a/modules/weko-index-tree/weko_index_tree/rest.py b/modules/weko-index-tree/weko_index_tree/rest.py index 8a4edb36c5..271dc0d3d2 100644 --- a/modules/weko-index-tree/weko_index_tree/rest.py +++ b/modules/weko-index-tree/weko_index_tree/rest.py @@ -712,6 +712,21 @@ def get(self, **kwargs): raise VersionNotFoundRESTError() def get_v1(self, **kwargs): + + def json_serialize(obj): + """Serialize object to JSON. + + Args: + obj: The object to serialize. + + Returns: + str: The serialized JSON string. + """ + if isinstance(obj, (datetime, date)): + return obj.strftime("%Y%m%d") + else: + return str(obj) + try: pid = kwargs.get('index_id') @@ -1531,7 +1546,7 @@ def _get_allowed_group_roles(self, index_info): Returns: dict: A dictionary with allowed group roles. """ - def _get_allowed_list(self, group_str): + def _get_allowed_list(self, group_str): """Convert group string to allowed group roles.""" return { "allow": [{"id": role} for role in group_str.split(",")] diff --git a/modules/weko-records-ui/weko_records_ui/rest.py b/modules/weko-records-ui/weko_records_ui/rest.py index 23d964d489..7e3fb0cd7f 100644 --- a/modules/weko-records-ui/weko_records_ui/rest.py +++ b/modules/weko-records-ui/weko_records_ui/rest.py @@ -67,6 +67,11 @@ InvalidTokenError, InvalidWorkflowError, ModeNotFoundRESTError, PermissionError, \ RecordsNotFoundRESTError, RequiredItemNotExistError, VersionNotFoundRESTError from .permissions import page_permission_factory, file_permission_factory +from .errors import AvailableFilesNotFoundRESTError, ContentsNotFoundError, \ + InvalidRequestError, VersionNotFoundRESTError, InternalServerError, \ + RecordsNotFoundRESTError, PermissionError, DateFormatRESTError, \ + FilesNotFoundRESTError, ModeNotFoundRESTError, RequiredItemNotExistError, \ + AuthenticationRequiredError from .scopes import file_read_scope from .views import escape_str, get_usage_workflow @@ -711,7 +716,10 @@ def get_v1(self, **kwargs): # Check Permission if not page_permission_factory(record).can(): - raise PermissionError() + if current_user.is_authenticated: + raise PermissionError() + else: + raise AuthenticationRequiredError() # Convert RO-Crate format from .utils import RoCrateConverter @@ -756,8 +764,10 @@ def get_v1(self, **kwargs): return res - except (PermissionError, SameContentException) as e: - raise e + except (PermissionError, + SameContentException, + AuthenticationRequiredError) as e: + raise e except PIDDoesNotExistError: raise RecordsNotFoundRESTError() diff --git a/modules/weko-records-ui/weko_records_ui/templates/weko_records_ui/output_detail_data.html b/modules/weko-records-ui/weko_records_ui/templates/weko_records_ui/output_detail_data.html index 0c5c412a5c..44ed8e0f40 100644 --- a/modules/weko-records-ui/weko_records_ui/templates/weko_records_ui/output_detail_data.html +++ b/modules/weko-records-ui/weko_records_ui/templates/weko_records_ui/output_detail_data.html @@ -83,7 +83,7 @@ {% if parrent_name %} {%- set labels = parrent_name.split('.') -%} {%- if labels|length == 1 -%} - {{ child_data(parrent_name, '', level) }} + {{ child_data(parrent_name, '　', level) }} {%- else -%} {%- set displayflag = False -%} {%- endif -%} @@ -118,7 +118,7 @@ {{ content | escape_str }} {%- elif content|url_to_link -%} {{ content | escape_str }} - {%- else -%} + {%- else -%} {{ content | escape_str }} {%- endif -%} {% endautoescape %} diff --git a/modules/weko-records/tests/test_utils.py b/modules/weko-records/tests/test_utils.py index f92e6db48e..b781302290 100644 --- a/modules/weko-records/tests/test_utils.py +++ b/modules/weko-records/tests/test_utils.py @@ -7,6 +7,7 @@ import copy from mock import patch, MagicMock from tests.helpers import json_data +import types from invenio_accounts import testutils from weko_admin.models import AdminSettings @@ -58,7 +59,9 @@ replace_fqdn, replace_fqdn_of_file_metadata, get_author_link, - set_file_date) + set_file_date, + check_embargo_rights, + update_embargo_rights) from weko_records.api import ItemTypes, Mapping from weko_records.models import ItemTypeName from weko_workflow.models import Activity @@ -122,7 +125,7 @@ def dumps(self): app.config['WEKO_SCHEMA_JPCOAR_V1_SCHEMA_NAME'] = 'jpcoar_v1_mapping' app.config['WEKO_SCHEMA_DDI_SCHEMA_NAME'] = 'ddi_mapping' dc, jrc, is_edit = json_loader(data3,_pid) - assert dc == OrderedDict([('item_1', {'attribute_name': 'item_1', 'attribute_value': 'item_1_v'}), ('item_2', {'attribute_name': 'item_2', 'attribute_value': ''}), ('item_3', {'attribute_name': 'item_3', 'attribute_type': 'creator', 'attribute_value_mlt': [{'item_3_1': 'item_3_1_v'}]}), ('item_4', {'attribute_name': 'item_4', 'attribute_value_mlt': [{'item_4_1': 'item_4_1_v'}]}), ('item_5', {'attribute_name': 'item_5', 'attribute_type': 'file', 'attribute_value_mlt': [{'filename': 'item_5'}]}), ('item_6', {'attribute_name': 'item_6', 'attribute_value_mlt': [{}]}), ('item_7', {'attribute_name': 'item_7', 'attribute_value_mlt': [{}, {'nameIdentifiers': [{'nameIdentifierScheme': 'WEKO', 'nameIdentifier': '1234'}]}]}), ('item_8', {'attribute_name': 'item_8', 'attribute_value_mlt': [{'nameIdentifiers': [{'nameIdentifierScheme': 'WEKO', 'nameIdentifier': '5678'}]}]}), ('item_title', 'test_item1'), ('item_type_id', '3'), ('control_number', '1'), + assert dc == OrderedDict([('item_1', {'attribute_name': 'item_1', 'attribute_value': 'item_1_v'}), ('item_2', {'attribute_name': 'item_2', 'attribute_value': ''}), ('item_3', {'attribute_name': 'item_3', 'attribute_type': 'creator', 'attribute_value_mlt': [{'item_3_1': 'item_3_1_v'}]}), ('item_4', {'attribute_name': 'item_4', 'attribute_value_mlt': [{'item_4_1': 'item_4_1_v'}]}), ('item_5', {'attribute_name': 'item_5', 'attribute_type': 'file', 'attribute_value_mlt': [{'filename': 'item_5'}]}), ('item_6', {'attribute_name': 'item_6', 'attribute_value_mlt': [{}]}), ('item_7', {'attribute_name': 'item_7', 'attribute_value_mlt': [{}, {'nameIdentifiers': [{'nameIdentifierScheme': 'WEKO', 'nameIdentifier': '1234'}]}]}), ('item_8', {'attribute_name': 'item_8', 'attribute_value_mlt': [{'nameIdentifiers': [{'nameIdentifierScheme': 'WEKO', 'nameIdentifier': '5678'}]}]}), ('item_title', 'test_item1'), ('item_type_id', '3'), ('control_number', '1'), ('author_link', ['1234', '5678']), ('weko_shared_ids', []), ('_oai', {'id': '1'}), ('owner', 1), ('owners', [1])]) assert jrc == {'item_4': ['item_4_1_v'], 'creator1': {'nameIdentifier': ['1234', '5678']}, 'item_5': ['item_5'], 'item_3': ['item_3_1_v'], 'control_number': '1', '_oai': {'id': '1'}, '_item_metadata': OrderedDict([('item_1', {'attribute_name': 'item_1', 'attribute_value': 'item_1_v'}), ('item_2', {'attribute_name': 'item_2', 'attribute_value': ''}), ('item_3', {'attribute_name': 'item_3', 'attribute_type': 'creator', 'attribute_value_mlt': [{'item_3_1': 'item_3_1_v'}]}), ('item_4', {'attribute_name': 'item_4', 'attribute_value_mlt': [{'item_4_1': 'item_4_1_v'}]}), ('item_5', {'attribute_name': 'item_5', 'attribute_type': 'file', 'attribute_value_mlt': [{'filename': 'item_5'}]}), ('item_6', {'attribute_name': 'item_6', 'attribute_value_mlt': [{}]}), ('item_7', {'attribute_name': 'item_7', 'attribute_value_mlt': [{}, {'nameIdentifiers': [{'nameIdentifierScheme': 'WEKO', 'nameIdentifier': '1234'}]}]}), ('item_8', {'attribute_name': 'item_8', 'attribute_value_mlt': [{'nameIdentifiers': [{'nameIdentifierScheme': 'WEKO', 'nameIdentifier': '5678'}]}]}), ('item_title', 'test_item1'), ('item_type_id', '3'), ('control_number', '1'), ('author_link', ['1234', '5678']), ('weko_shared_ids', []), ('_oai', {'id': '1'}), ('owner', 1), ('owners', [1])]), 'itemtype': 'test10', 'publish_date': None, @@ -175,18 +178,18 @@ class MockSM: dc, jrc, is_edit = json_loader(data5, _pid) assert dc == OrderedDict([('item_1', {'attribute_name': 'item_1', 'attribute_value': 'item_1_v'}), ('item_2', {'attribute_name': 'item_2', 'attribute_value': 'item_2_v'}), ('item_3', {'attribute_name': 'item_3', 'attribute_type': 'creator', 'attribute_value_mlt': [{'item_3_1': 'item_3_1_v'}]}), ('item_4', {'attribute_name': 'item_4', 'attribute_value_mlt': [{'item_4_1': 'item_4_1_v'}]}), ('item_5', {'attribute_name': 'item_5', 'attribute_type': 'file', 'attribute_value_mlt': [{'filename': 'item_5'}]}), ('item_6', {'attribute_name': 'item_6', 'attribute_value_mlt': [{'item_6_1': 'item_6_1_v'}]}), ('item_7', {'attribute_name': 'item_7', 'attribute_value_mlt': [{}, {'nameIdentifiers': [{'nameIdentifierScheme': 'WEKO', 'nameIdentifier': '1234'}]}]}), ('item_8', {'attribute_name': 'item_8', 'attribute_value_mlt': [{'nameIdentifiers': [{'nameIdentifierScheme': 'WEKO', 'nameIdentifier': '5678'}]}]}), ('item_title', 'test_item2'), ('item_type_id', '3'), ('control_number', '1'), ('author_link', ['1234', '5678']), ('weko_shared_ids', [2]), ('owner', 5), ('owners', [5])]) - assert jrc == {'item_5': ['item_5'], 'item_4': ['item_4_1_v'], 'creator1': {'nameIdentifier': ['1234', '5678']}, 'item_6': ['item_6_1_v'], 'item_3': ['item_3_1_v'], 'control_number': '1', '_oai': {'id': '1'}, '_item_metadata': - OrderedDict([('item_1', {'attribute_name': 'item_1', 'attribute_value': 'item_1_v'}), - ('item_2', {'attribute_name': 'item_2', 'attribute_value': 'item_2_v'}), + assert jrc == {'item_5': ['item_5'], 'item_4': ['item_4_1_v'], 'creator1': {'nameIdentifier': ['1234', '5678']}, 'item_6': ['item_6_1_v'], 'item_3': ['item_3_1_v'], 'control_number': '1', '_oai': {'id': '1'}, '_item_metadata': + OrderedDict([('item_1', {'attribute_name': 'item_1', 'attribute_value': 'item_1_v'}), + ('item_2', {'attribute_name': 'item_2', 'attribute_value': 'item_2_v'}), ('item_3', {'attribute_name': 'item_3', 'attribute_type': 'creator', 'attribute_value_mlt': [{'item_3_1': 'item_3_1_v'}]}), ('item_4', {'attribute_name': 'item_4', 'attribute_value_mlt': [{'item_4_1': 'item_4_1_v'}]}), ('item_5', {'attribute_name': 'item_5', 'attribute_type': 'file', 'attribute_value_mlt': [{'filename': 'item_5'}]}), ('item_6', {'attribute_name': 'item_6', 'attribute_value_mlt': [{'item_6_1': 'item_6_1_v'}]}), ('item_7', {'attribute_name': 'item_7', 'attribute_value_mlt': [{}, {'nameIdentifiers': [{'nameIdentifierScheme': 'WEKO', 'nameIdentifier': '1234'}]}]}), ('item_8', {'attribute_name': 'item_8', 'attribute_value_mlt': [{'nameIdentifiers': [{'nameIdentifierScheme': 'WEKO', 'nameIdentifier': '5678'}]}]}), - ('item_title', 'test_item2'), ('item_type_id', '3'), ('control_number', '1'), + ('item_title', 'test_item2'), ('item_type_id', '3'), ('control_number', '1'), ('author_link', ['1234', '5678']),('weko_shared_ids', [2]), ('owner', 5), ('owners', [5])]), - 'itemtype': 'test10', 'publish_date': None, + 'itemtype': 'test10', 'publish_date': None, 'author_link': ['1234', '5678'], 'weko_creator_id': '5', 'weko_shared_ids': [2]} assert is_edit == True @@ -836,6 +839,111 @@ def dumps(self): assert jrc == {'weko_creator_id': '1', 'item_5': ['item_5'], 'item_6': ['item_6_1_v'], 'item_3': ['item_3_1_v'], 'item_4': ['item_4_1_v'], 'creator1': {'nameIdentifier': ['1234', '5678']}, 'control_number': '1', '_oai': {'id': '1'}, '_item_metadata': OrderedDict([('item_1', {'attribute_name': 'item_1', 'attribute_value': 'item_1_v'}), ('item_2', {'attribute_name': 'item_2', 'attribute_value': 'item_2_v'}), ('item_3', {'attribute_name': 'item_3', 'attribute_type': 'creator', 'attribute_value_mlt': [{'item_3_1': 'item_3_1_v'}]}), ('item_4', {'attribute_name': 'item_4', 'attribute_value_mlt': [{'item_4_1': 'item_4_1_v'}]}), ('item_5', {'attribute_name': 'item_5', 'attribute_type': 'file', 'attribute_value_mlt': [{'filename': 'item_5'}]}), ('item_6', {'attribute_name': 'item_6', 'attribute_value': ['item_6_1', 'item_6_1_v']}), ('item_7', {'attribute_name': 'item_7', 'attribute_value_mlt': [{}, {'nameIdentifiers': [{'nameIdentifierScheme': 'WEKO', 'nameIdentifier': '1234'}]}]}), ('item_8', {'attribute_name': 'item_8', 'attribute_value_mlt': [{'nameIdentifiers': [{'nameIdentifierScheme': 'WEKO', 'nameIdentifier': '5678'}]}]}), ('item_title', 'test_item2'), ('item_type_id', '3'), ('control_number', '1'), ('author_link', ['1234', '5678']), ('weko_shared_ids', 2), ('_oai', {'id': '1'}), ('owner', 1), ('owners', [1])]), 'itemtype': 'test10', 'publish_date': None, 'author_link': ['1234', '5678'], 'weko_shared_ids': 2} assert is_edit == False +# .tox/c1/bin/pytest --cov=weko_records tests/test_utils.py::test_json_loader_access_rights -v -s -vv --cov-branch --cov-report=html --cov-config=tox.ini --basetemp=/code/modules/weko-records/.tox/c1/tmp +def test_json_loader_access_rights(app, db, monkeypatch): + app.config["WEKO_SEARCH_FIX_ACCESSRIGHTS"] = True + + minimal_item_data = { + "$schema": "test_schema/1", + "item_type_id": "test", + "item_1": { + "attribute_name": "アクセス権", + "attribute_value_mlt": [ + { + "subitem_access_right": "open access", + "subitem_access_right_uri": "http://purl.org/coar/access_right/c_f1cf" + } + ] + }, + } + minimal_item_data2 = { + "$schema": "test_schema/1", + "item_type_id": "test", + "item_1": { + "attribute_name": "アクセス権", + "attribute_value_mlt": [{}] + }, + } + minimal_item_data3 = { + "$schema": "test_schema/1", + "item_type_id": "test", + "item_1": { + "attribute_name": "アクセス権", + "attribute_value_mlt": "test_data" + }, + } + class DummyPid: + object_uuid = "dummy-uuid" + pid_value = "dummy-pid" + minimal_pid = DummyPid() + + # ItemTypes, Mapping, SchemaTree, PersistentIdentifier, current_pidstore などをモック + from collections import UserDict + class DummyOjson(UserDict): + pass + + dummy_ojson = DummyOjson() + dummy_ojson["properties"] = { + "item_1": { + "type": "array", + "items": {"properties": {}} + } + } + dummy_ojson.model = types.SimpleNamespace() + dummy_ojson.model.item_type_name = types.SimpleNamespace() + dummy_ojson.model.item_type_name.name = "dummy_type" + dummy_mjson = types.SimpleNamespace() + dummy_mjson.dumps = lambda: {"item_1": {}} + dummy_schema_tree = types.SimpleNamespace() + dummy_schema_tree.get_jpcoar_json = lambda jpcoar, replace_field=True: { + "item_1": { + "attribute_value_mlt": [ + {"subitem_access_right": "open access"} + ] + } + } + monkeypatch.setattr("weko_records.utils.ItemTypes", types.SimpleNamespace(get_record=lambda *a, **k: dummy_ojson)) + monkeypatch.setattr("weko_records.utils.Mapping", types.SimpleNamespace(get_record=lambda *a, **k: dummy_mjson)) + monkeypatch.setattr("weko_records.utils.SchemaTree", types.SimpleNamespace(get_jpcoar_json=dummy_schema_tree.get_jpcoar_json)) + monkeypatch.setattr("weko_records.utils.PersistentIdentifier", types.SimpleNamespace(get_by_object=lambda *a, **k: types.SimpleNamespace(pid_value="oaiid"), get=lambda *a, **k: types.SimpleNamespace(object_uuid="dummy-uuid"))) + monkeypatch.setattr("weko_records.utils.current_pidstore", types.SimpleNamespace(minters={"oaiid": lambda *a, **k: types.SimpleNamespace(pid_value="oaiid")})) + monkeypatch.setattr("weko_records.utils.current_user", types.SimpleNamespace(get_id=lambda: "1")) + monkeypatch.setattr("weko_records.utils.COPY_NEW_FIELD", False) + monkeypatch.setattr("weko_records.utils.sm", types.SimpleNamespace(get=lambda: None)) + monkeypatch.setattr("weko_records.utils.ad_config", types.SimpleNamespace(WEKO_ADMIN_MANAGEMENT_OPTIONS={"detail_condition": []})) + + access_path = "item_1.attribute_value_mlt.subitem_access_right" + with app.app_context(): + # When access_path is set (accessRights should be found) + monkeypatch.setattr("weko_records.serializers.utils.get_mapping", lambda i, t: {"accessRights.@value": access_path}) + monkeypatch.setattr("weko_records.utils.update_embargo_rights", lambda meta: None) + from weko_records.utils import json_loader + dc, jrc, is_edit = json_loader(minimal_item_data, minimal_pid) + assert "accessRights" in jrc + assert "open access" in jrc["accessRights"] + + # When access_path is not set (accessRights should not exist) + monkeypatch.setattr("weko_records.serializers.utils.get_mapping", lambda i, t: {}) + dc, jrc, is_edit = json_loader(minimal_item_data, minimal_pid) + assert "accessRights" not in jrc + + # When config is False (accessRights should not exist) + app.config["WEKO_SEARCH_FIX_ACCESSRIGHTS"] = False + monkeypatch.setattr("weko_records.serializers.utils.get_mapping", lambda i, t: {"accessRights.@value": access_path}) + dc, jrc, is_edit = json_loader(minimal_item_data, minimal_pid) + assert "accessRights" not in jrc + + # When access_path is set but value cannot be found (accessRights should not exist) + app.config["WEKO_SEARCH_FIX_ACCESSRIGHTS"] = True + monkeypatch.setattr("weko_records.serializers.utils.get_mapping", lambda i, t: {"accessRights.@value": access_path}) + dc, jrc, is_edit = json_loader(minimal_item_data2, minimal_pid) + assert "accessRights" not in jrc + + # When access_path is set but value cannot be found (accessRights should not exist) + monkeypatch.setattr("weko_records.serializers.utils.get_mapping", lambda i, t: {"accessRights.@value": access_path}) + dc, jrc, is_edit = json_loader(minimal_item_data3, minimal_pid) + assert "accessRights" not in jrc + # def get_author_link(author_link, value) # .tox/c1/bin/pytest --cov=weko_records tests/test_utils.py::test_get_author_link -v -s -vv --cov-branch --cov-report=term --cov-report=html --cov-config=tox.ini --basetemp=/code/modules/weko-records/.tox/c1/tmp @@ -2649,3 +2757,361 @@ def test_replace_fqdn_of_file_metadata(app): replace_fqdn_of_file_metadata(_file_metadata_list2) assert _file_metadata_list2==[{'url': {'url': 'https://localhost/a'}, 'version_id': '1'}, {'url': {'url': 'https://localhost/b'}, 'version_id': '1'}] +import datetime +# .tox/c1/bin/pytest --cov=weko_records tests/test_utils.py::test_check_embargo_rights -v -s -vv --cov-branch --cov-report=term --cov-config=tox.ini --basetemp=/code/modules/weko-records/.tox/c1/tmp +def test_check_embargo_rights(): + # Do nothing except for 'embargoed access' + result = check_embargo_rights("open_access", datetime.date.today(), []) + assert result == (False, None) + + # If there is at least one 'open_restricted', return 'restricted access' + today = datetime.date.today() + accessrole_date = [("open_restricted", None), ("open_access", None)] + result = check_embargo_rights("embargoed access", today, accessrole_date) + assert result == (True, "restricted access") + + # If there is a future date in 'open_date', do nothing + today = datetime.date.today() + future = today + datetime.timedelta(days=1) + accessrole_date = [("open_date", future)] + result = check_embargo_rights("embargoed access", today, accessrole_date) + assert result == (False, None) + + # If there is at least one 'open_login', return 'restricted access' + today = datetime.date.today() + accessrole_date = [("open_login", None)] + result = check_embargo_rights("embargoed access", today, accessrole_date) + assert result == (True, "restricted access") + + # If all are 'open_access', return 'open access' + today = datetime.date.today() + accessrole_date = [("open_access", None), ("open_access", None)] + result = check_embargo_rights("embargoed access", today, accessrole_date) + assert result == (True, "open access") + + # If all are 'open_date' and the date is in the past, return 'open access' + today = datetime.date.today() + past = today - datetime.timedelta(days=1) + accessrole_date = [("open_date", past), ("open_date", past)] + result = check_embargo_rights("embargoed access", today, accessrole_date) + assert result == (True, "open access") + + # If 'open_access' and 'open_date' (past) are mixed, return 'open access' + today = datetime.date.today() + past = today - datetime.timedelta(days=1) + accessrole_date = [("open_access", None), ("open_date", past)] + result = check_embargo_rights("embargoed access", today, accessrole_date) + assert result == (True, "open access") + + # If accessrole_date is empty, do nothing + today = datetime.date.today() + accessrole_date = [] + result = check_embargo_rights("embargoed access", today, accessrole_date) + assert result == (False, None) + +from unittest.mock import MagicMock +import weko_records.utils as utils + +# .tox/c1/bin/pytest --cov=weko_records tests/test_utils.py::test_update_embargo_rights -v -s -vv --cov-branch --cov-report=term --cov-config=tox.ini --basetemp=/code/modules/weko-records/.tox/c1/tmp +def test_update_embargo_rights(app, monkeypatch): + base_meta = { + "item_type_id": "test", + "item_1736146823660": { + "attribute_name": "アクセス権", + "attribute_value_mlt": [ + { + "subitem_access_right": "embargoed access", + "subitem_access_right_uri": "http://purl.org/coar/access_right/c_f1cf" + } + ] + }, + "item_1736148125517": { + "attribute_name": "ファイル情報", + "attribute_type": "file", + "attribute_value_mlt": [ + { + "url": { + "url": "https://weko3.example.org/record/2000088/files/image141.png" + }, + "date": [ + { + "dateType": "Available", + "dateValue": "2026-03-31" + } + ], + "format": "image/png", + "filename": "image141.png", + "filesize": [ + { + "value": "11 KB" + } + ], + "accessrole": "open_date", + "version_id": "55995df6-6d1c-4bbf-8530-d1c0fb5a4219", + } + ] + } + } + + # Embargo is released and access becomes open_access + cfg = True + meta = copy.deepcopy(base_meta) + access_path = "item_1736146823660.attribute_value_mlt.subitem_access_right" + access_right_type_uri = { + "embargoed access": "http://purl.org/coar/access_right/c_f1cf", + "metadata only access": "http://purl.org/coar/access_right/c_14cb", + "open access": "http://purl.org/coar/access_right/c_abf2", + "restricted access": "http://purl.org/coar/access_right/c_16ec", + } + monkeypatch.setattr( + utils, + "current_app", + MagicMock(config={ + "WEKO_SEARCH_FIX_ACCESSRIGHTS": cfg, + "ACCESS_RIGHT_TYPE_URI": access_right_type_uri, + }) + ) + monkeypatch.setattr("weko_records.serializers.utils.get_mapping", lambda i, t: {"accessRights.@value": access_path}) + monkeypatch.setattr(utils, "check_embargo_rights", lambda a, t, d: (True, "open access")) + utils.update_embargo_rights(meta) + assert meta["item_1736146823660"]["attribute_value_mlt"][0]["subitem_access_right"] == "open access" + assert meta["item_1736146823660"]["attribute_value_mlt"][0]["subitem_access_right_uri"] == "http://purl.org/coar/access_right/c_abf2" + + # Embargo is released and access becomes restricted_access + meta = copy.deepcopy(base_meta) + monkeypatch.setattr(utils, "check_embargo_rights", lambda a, t, d: (True, "restricted access")) + utils.update_embargo_rights(meta) + assert meta["item_1736146823660"]["attribute_value_mlt"][0]["subitem_access_right"] == "restricted access" + assert meta["item_1736146823660"]["attribute_value_mlt"][0]["subitem_access_right_uri"] == "http://purl.org/coar/access_right/c_16ec" + + # Embargo is not released (returns None), access remains embargoed + meta = copy.deepcopy(base_meta) + monkeypatch.setattr(utils, "check_embargo_rights", lambda a, t, d: (False, None)) + utils.update_embargo_rights(meta) + assert meta["item_1736146823660"]["attribute_value_mlt"][0]["subitem_access_right"] == "embargoed access" + assert meta["item_1736146823660"]["attribute_value_mlt"][0]["subitem_access_right_uri"] == "http://purl.org/coar/access_right/c_f1cf" + + # File information with accessrole=None is handled correctly + meta = copy.deepcopy(base_meta) + meta["item_1736146823660"]["attribute_value_mlt"][0]["accessrole"] = None + monkeypatch.setattr(utils, "check_embargo_rights", lambda a, t, d: (False, None)) + utils.update_embargo_rights(meta) + assert meta["item_1736146823660"]["attribute_value_mlt"][0]["subitem_access_right"] == "embargoed access" + assert meta["item_1736146823660"]["attribute_value_mlt"][0]["subitem_access_right_uri"] == "http://purl.org/coar/access_right/c_f1cf" + + # Access rights information with None is handled correctly + meta = copy.deepcopy(base_meta) + meta["item_1736146823660"]["attribute_value_mlt"][0]["subitem_access_right"] = None + monkeypatch.setattr(utils, "check_embargo_rights", lambda a, t, d: (False, None)) + utils.update_embargo_rights(meta) + assert meta["item_1736146823660"]["attribute_value_mlt"][0]["subitem_access_right"] == None + + # Empty meta dict does not change anything + meta = {} + utils.update_embargo_rights(meta) + assert "subitem_access_right" not in meta + + # No change if access_path does not exist in mapping + meta = copy.deepcopy(base_meta) + monkeypatch.setattr(utils, "current_app", MagicMock(config={"WEKO_SEARCH_FIX_ACCESSRIGHTS": True})) + monkeypatch.setattr("weko_records.serializers.utils.get_mapping", lambda i, t: {}) # accessRights.@valueなし + monkeypatch.setattr(utils, "check_embargo_rights", lambda a, t, d: (True, "open access")) + utils.update_embargo_rights(meta) + assert meta["item_1736146823660"]["attribute_value_mlt"][0]["subitem_access_right"] == "embargoed access" + + # No change if WEKO_SEARCH_FIX_ACCESSRIGHTS is False + meta = copy.deepcopy(base_meta) + monkeypatch.setattr(utils, "current_app", MagicMock(config={"WEKO_SEARCH_FIX_ACCESSRIGHTS": False})) + monkeypatch.setattr("weko_records.serializers.utils.get_mapping", lambda i, t: {"accessRights.@value": access_path}) + monkeypatch.setattr(utils, "check_embargo_rights", lambda a, t, d: (True, "open access")) + utils.update_embargo_rights(meta) + assert meta["item_1736146823660"]["attribute_value_mlt"][0]["subitem_access_right"] == "embargoed access" + + # Only the second element in attribute_value_mlt list is the target key + meta = { + "item_type_id": "test", + "item_1": { + "attribute_value_mlt": [ + {"dummy": 1}, + {"subitem_access_right": "embargoed access"} + ] + } + } + access_path = "item_1.attribute_value_mlt.subitem_access_right" + monkeypatch.setattr(utils, "current_app", MagicMock(config={"WEKO_SEARCH_FIX_ACCESSRIGHTS": True})) + monkeypatch.setattr("weko_records.serializers.utils.get_mapping", lambda i, t: {"accessRights.@value": access_path}) + monkeypatch.setattr(utils, "check_embargo_rights", lambda a, t, d: (True, "open access")) + utils.update_embargo_rights(meta) + assert meta["item_1"]["attribute_value_mlt"][1]["subitem_access_right"] == "open access" + + # Deep nesting in attribute_value_mlt is handled correctly + meta = { + "item_type_id": "test", + "item_1": { + "attribute_value_mlt": [ + {"attribute_value_mlt": [ + {"subitem_access_right": "embargoed access"} + ]} + ] + } + } + access_path = "item_1.attribute_value_mlt.attribute_value_mlt.subitem_access_right" + monkeypatch.setattr(utils, "current_app", MagicMock(config={"WEKO_SEARCH_FIX_ACCESSRIGHTS": True})) + monkeypatch.setattr("weko_records.serializers.utils.get_mapping", lambda i, t: {"accessRights.@value": access_path}) + monkeypatch.setattr(utils, "check_embargo_rights", lambda a, t, d: (False, None)) + utils.update_embargo_rights(meta) + assert meta["item_1"]["attribute_value_mlt"][0]["attribute_value_mlt"][0]["subitem_access_right"] == "embargoed access" + + # Tests recursive list branch in _set_nested_value; all nested rights are updated. + meta = { + "item_type_id": "test", + "item_1": { + "attribute_value_mlt": [ + {"attribute_value_mlt": [ + {"subitem_access_right": "embargoed access"}, + {"subitem_access_right": "embargoed access"} + ]}, + {"attribute_value_mlt": [ + {"subitem_access_right": "embargoed access"} + ]} + ] + } + } + access_path = "item_1.attribute_value_mlt.attribute_value_mlt.subitem_access_right" + monkeypatch.setattr(utils, "current_app", MagicMock(config={"WEKO_SEARCH_FIX_ACCESSRIGHTS": True})) + monkeypatch.setattr("weko_records.serializers.utils.get_mapping", lambda i, t: {"accessRights.@value": access_path}) + monkeypatch.setattr(utils, "check_embargo_rights", lambda a, t, d: (True, "open access")) + utils.update_embargo_rights(meta) + for item in meta["item_1"]["attribute_value_mlt"]: + for subitem in item["attribute_value_mlt"]: + assert subitem["subitem_access_right"] == "open access" + + # File information date (dateValue) is None + meta = { + "item_type_id": "test", + "item_1": { + "attribute_type": "file", + "attribute_value_mlt": [ + { + "date": [ + {"dateType": "Available", "dateValue": None} + ], + "accessrole": "open_date", + "subitem_access_right": "embargoed access" + } + ] + } + } + access_path = "item_1.attribute_value_mlt.subitem_access_right" + monkeypatch.setattr(utils, "current_app", MagicMock(config={"WEKO_SEARCH_FIX_ACCESSRIGHTS": True})) + monkeypatch.setattr("weko_records.serializers.utils.get_mapping", lambda i, t: {"accessRights.@value": access_path}) + monkeypatch.setattr(utils, "check_embargo_rights", lambda a, t, d: (False, None)) + utils.update_embargo_rights(meta) + assert meta["item_1"]["attribute_value_mlt"][0]["subitem_access_right"] == "embargoed access" + + # File information date (dateValue) is invalid format + meta = { + "item_type_id": "test", + "item_1": { + "attribute_type": "file", + "attribute_value_mlt": [ + { + "date": [ + {"dateType": "Available", "dateValue": "test_invalid"} + ], + "accessrole": "open_date", + "subitem_access_right": "embargoed access" + } + ] + } + } + access_path = "item_1.attribute_value_mlt.subitem_access_right" + monkeypatch.setattr(utils, "current_app", MagicMock(config={"WEKO_SEARCH_FIX_ACCESSRIGHTS": True})) + monkeypatch.setattr("weko_records.serializers.utils.get_mapping", lambda i, t: {"accessRights.@value": access_path}) + monkeypatch.setattr(utils, "check_embargo_rights", lambda a, t, d: (False, None)) + utils.update_embargo_rights(meta) + assert meta["item_1"]["attribute_value_mlt"][0]["subitem_access_right"] == "embargoed access" + + # Update value if mapping path points to a key inside attribute_value_mlt list element, even if not directly in the dict. + meta = { + "item_type_id": "test", + "item_1": { + "attribute_value_mlt": [ + {"subitem_access_right": "embargoed access"} + ] + } + } + access_path = "item_1.subitem_access_right" + monkeypatch.setattr(utils, "current_app", MagicMock(config={"WEKO_SEARCH_FIX_ACCESSRIGHTS": True})) + monkeypatch.setattr("weko_records.serializers.utils.get_mapping", lambda i, t: {"accessRights.@value": access_path}) + monkeypatch.setattr(utils, "check_embargo_rights", lambda a, t, d: (True, "open access")) + utils.update_embargo_rights(meta) + assert meta["item_1"]["attribute_value_mlt"][0]["subitem_access_right"] == "open access" + + # Test: Do nothing if mapping path points to a key that does not exist in any attribute_value_mlt list element. + meta = { + "item_type_id": "test", + "item_1": { + "attribute_value_mlt": [ + {"dummy": 1} + ] + } + } + access_path = "item_1.subitem_access_right" + monkeypatch.setattr(utils, "current_app", MagicMock(config={"WEKO_SEARCH_FIX_ACCESSRIGHTS": True})) + monkeypatch.setattr("weko_records.serializers.utils.get_mapping", lambda i, t: {"accessRights.@value": access_path}) + monkeypatch.setattr(utils, "check_embargo_rights", lambda a, t, d: (False, None)) + utils.update_embargo_rights(meta) + assert "subitem_access_right" not in meta["item_1"]["attribute_value_mlt"][0] + + # If mapping points to a non-dict/list (e.g. int), no error and value stays unchanged. + class DummyMapping(dict): + def get(self, key, default=None): + if key == "accessRights.@value": + return "item1.item2.item3" + return super().get(key, default) + def dummy_get_mapping(item_type_id, mapping_type): + return DummyMapping({"accessRights.@value": "item1.item2.item3"}) + monkeypatch.setattr("weko_records.serializers.utils.get_mapping", dummy_get_mapping) + with app.app_context(): + import flask + flask.current_app.config["WEKO_SEARCH_FIX_ACCESSRIGHTS"] = True + metadata = { + "item_type_id": 1, + "item1": {"item2": 12345} + } + update_embargo_rights(metadata) + assert metadata["item1"]["item2"] == 12345 + + # access_path points to a nested key inside a list + meta = { + "item_type_id": "test", + "item_1": { + "attribute_value_mlt": [ + {"subitem_access_right": "embargoed access"}, + {"subitem_access_right": "embargoed access"} + ] + } + } + access_path = "item_1.attribute_value_mlt.subitem_access_right" + monkeypatch.setattr(utils, "current_app", MagicMock(config={"WEKO_SEARCH_FIX_ACCESSRIGHTS": True})) + monkeypatch.setattr("weko_records.serializers.utils.get_mapping", lambda i, t: {"accessRights.@value": access_path}) + monkeypatch.setattr(utils, "check_embargo_rights", lambda a, t, d: (True, "open access")) + utils.update_embargo_rights(meta) + # Both elements in the list should be updated + assert meta["item_1"]["attribute_value_mlt"][0]["subitem_access_right"] == "open access" + assert meta["item_1"]["attribute_value_mlt"][1]["subitem_access_right"] == "open access" + + # When the list is empty + meta = { + "item_type_id": "test", + "item_1": { + "attribute_value_mlt": [] + } + } + access_path = "item_1.attribute_value_mlt.subitem_access_right" + monkeypatch.setattr(utils, "current_app", MagicMock(config={"WEKO_SEARCH_FIX_ACCESSRIGHTS": True})) + monkeypatch.setattr("weko_records.serializers.utils.get_mapping", lambda i, t: {"accessRights.@value": access_path}) + monkeypatch.setattr(utils, "check_embargo_rights", lambda a, t, d: (True, "open access")) + utils.update_embargo_rights(meta) + assert meta["item_1"]["attribute_value_mlt"] == [] diff --git a/modules/weko-records/weko_records/utils.py b/modules/weko-records/weko_records/utils.py index d78c5978e6..47493cc89b 100644 --- a/modules/weko-records/weko_records/utils.py +++ b/modules/weko-records/weko_records/utils.py @@ -280,6 +280,42 @@ def _set_shared_ids(data): dc.update(dict(owner=int(owner_id))) dc.update(dict(owners=[int(owner_id)])) + if current_app.config.get("WEKO_SEARCH_FIX_ACCESSRIGHTS", False): + update_embargo_rights(jrc["_item_metadata"]) + + from weko_records.serializers.utils import get_mapping + mapping = get_mapping(item_type_id, "jpcoar_mapping") + access_path = mapping.get("accessRights.@value") + def _get_nested_value(data, path): + keys = path.split('.') + key = keys[0] + rest = '.'.join(keys[1:]) + if isinstance(data, dict): + if key in data: + if rest: + return _get_nested_value(data[key], rest) + else: + return data[key] + elif 'attribute_value_mlt' in data: + for item in data['attribute_value_mlt']: + found = _get_nested_value(item, '.'.join(keys)) + if found is not None: + return found + return None + else: + return None + elif isinstance(data, list): + for item in data: + found = _get_nested_value(item, '.'.join(keys)) + if found is not None: + return found + return None + else: + return None + access_right = _get_nested_value(jrc["_item_metadata"], access_path) if access_path else None + if access_right: + jrc["accessRights"] = [access_right] + del ojson, mjson, item return dc, jrc, is_edit @@ -2864,3 +2900,173 @@ def replace_fqdn_of_file_metadata(file_metadata_lst: list, file_url: list = None file["url"]["url"] = replace_fqdn(file["url"]["url"]) elif isinstance(file_url, list): file_url.append(file["url"]["url"]) + +def check_embargo_rights(access_right: str, today, accessrole_date: list = []): + """ + Determines whether the accessrights value needs to be updated based on + the mapped item values and file information, and what value it should be + changed to. + Args: + access_right (str): The value mapped to the item's accessRight. + today (date): The current date. + accessrole_date (list): List of (accessrole, date) tuples for + registered files. + Returns: + is_update_required (bool): Whether an update is required. + change_value (str): The value after the update. + """ + # Do nothing if not 'embargoed access' + if access_right != "embargoed access": + return False, None + + # 1. If there is at least one 'open_restricted', set to 'restricted access' + if any( + role == "open_restricted" for role, _ in accessrole_date + ): + return True, "restricted access" + + # 2. If there is at least one 'open_date' with a future date, no update required + if any( + role == "open_date" and date and today and date > today + for role, date in accessrole_date + ): + return False, None + + # 3. If there is at least one 'open_login', set to 'restricted access' + if any( + role == "open_login" for role, _ in accessrole_date + ): + return True, "restricted access" + + # 4. If all are 'open_access' or 'open_date' with date <= today, + # set to 'open access' + if accessrole_date and all( + (role == "open_access") or + (role == "open_date" and date and today and date <= today) + for role, date in accessrole_date + ): + return True, "open access" + + return False, None + +def update_embargo_rights(metadata: dict) -> None: + """ + Update accessrights value in item metadata in-place. + Args: + metadata (dict): Item metadata to update. + Returns: + None (modifies metadata in-place) + """ + # Skip if config disables accessrights fix + if not current_app.config.get("WEKO_SEARCH_FIX_ACCESSRIGHTS", False): + return + + item_type_id = metadata.get("item_type_id") + if not item_type_id: + return + + from weko_records.serializers.utils import get_mapping + mapping = get_mapping(item_type_id, "jpcoar_mapping") + access_path = mapping.get("accessRights.@value") + if not access_path: + return + + if access_path.endswith("subitem_access_right"): + access_uri_path = ( + access_path[:-len("subitem_access_right")] + + "subitem_access_right_uri" + ) + else: + access_uri_path = None + + def _get_nested_value(data, path): + keys = path.split('.') + key = keys[0] + rest = '.'.join(keys[1:]) + if isinstance(data, dict): + if key in data: + if rest: + return _get_nested_value(data[key], rest) + else: + return data[key] + elif 'attribute_value_mlt' in data: + for item in data['attribute_value_mlt']: + found = _get_nested_value(item, '.'.join(keys)) + if found is not None: + return found + return None + else: + return None + elif isinstance(data, list): + for item in data: + found = _get_nested_value(item, '.'.join(keys)) + if found is not None: + return found + return None + else: + return None + + access_right_value = _get_nested_value(metadata, access_path) + if not access_right_value: + return + + from datetime import datetime + accessrole_date = [] + today = datetime.now().date() + + for v in metadata.values(): + if ( + isinstance(v, dict) and v.get("attribute_type") == "file" + ): + mlt = v.get("attribute_value_mlt", []) + for data in mlt: + date_val = None + accessrole_val = data.get("accessrole") + if ( + "date" in data and + isinstance(data["date"], list) and + data["date"] + ): + date_val = data["date"][0].get("dateValue") + if date_val: + if re.match(r"^\d{4}-\d{2}-\d{2}$", date_val): + date_val = datetime.strptime(date_val, "%Y-%m-%d").date() + else: + date_val = None + if accessrole_val: + accessrole_date.append((accessrole_val, date_val)) + + from .utils import check_embargo_rights + is_update, change_value = check_embargo_rights( + access_right_value, today, accessrole_date + ) + + access_right_type_uri = current_app.config.get("ACCESS_RIGHT_TYPE_URI", {}) + access_right_type_uri_value = access_right_type_uri.get(change_value, "") + + def _set_nested_value(data, path, value): + keys = path.split('.') + key = keys[0] + rest = '.'.join(keys[1:]) + if isinstance(data, list): + for item in data: + _set_nested_value(item, path, value) + return + if len(keys) == 1: + if isinstance(data, dict) and key in data: + data[key] = value + if isinstance(data, dict) and 'attribute_value_mlt' in data: + for item in data['attribute_value_mlt']: + _set_nested_value(item, key, value) + else: + if isinstance(data, dict): + if key in data: + _set_nested_value(data[key], rest, value) + if 'attribute_value_mlt' in data: + for item in data['attribute_value_mlt']: + _set_nested_value(item, rest, value) + + if is_update and change_value: + _set_nested_value(metadata, access_path, change_value) + if access_uri_path and access_right_type_uri_value: + _set_nested_value(metadata, access_uri_path, access_right_type_uri_value) diff --git a/modules/weko-search-ui/requirements2.txt b/modules/weko-search-ui/requirements2.txt index c4702c5184..b01f66293a 100644 --- a/modules/weko-search-ui/requirements2.txt +++ b/modules/weko-search-ui/requirements2.txt @@ -288,3 +288,4 @@ xmlschema==0.9.30 xmltodict==0.12.0 zipp==3.6.0 zope.interface==5.5.2 +pypdfium2==4.30.0 diff --git a/modules/weko-search-ui/tests/conftest.py b/modules/weko-search-ui/tests/conftest.py index f134eb98ca..a81cf2ee36 100644 --- a/modules/weko-search-ui/tests/conftest.py +++ b/modules/weko-search-ui/tests/conftest.py @@ -137,7 +137,13 @@ from weko_deposit.api import WekoDeposit from weko_deposit.api import WekoDeposit as aWekoDeposit from weko_deposit.api import WekoIndexer, WekoRecord -from weko_deposit.config import WEKO_BUCKET_QUOTA_SIZE, WEKO_MAX_FILE_SIZE +from weko_deposit.config import ( + WEKO_BUCKET_QUOTA_SIZE, + WEKO_MAX_FILE_SIZE, + WEKO_DEPOSIT_FILESIZE_LIMIT, + WEKO_MIMETYPE_WHITELIST_FOR_ES, + WEKO_DEPOSIT_TEXTMIMETYPE_WHITELIST_FOR_ES +) from weko_groups import WekoGroups from weko_index_tree import WekoIndexTree, WekoIndexTreeREST from weko_index_tree.api import Indexes @@ -692,6 +698,9 @@ def base_app(instance_path, search_class, request): WEKO_SEARCH_UI_BULK_EXPORT_RETRY = 5, WEKO_SEARCH_UI_BULK_EXPORT_LIMIT = 100, RECORDS_UI_ENDPOINTS = RECORDS_UI_ENDPOINTS, + WEKO_DEPOSIT_FILESIZE_LIMIT = WEKO_DEPOSIT_FILESIZE_LIMIT, + WEKO_MIMETYPE_WHITELIST_FOR_ES = WEKO_MIMETYPE_WHITELIST_FOR_ES, + WEKO_DEPOSIT_TEXTMIMETYPE_WHITELIST_FOR_ES = WEKO_DEPOSIT_TEXTMIMETYPE_WHITELIST_FOR_ES, WEKO_SCHEMA_JPCOAR_V2_RESOURCE_TYPE_REPLACE={ "periodical": "journal", "interview": "other", diff --git a/modules/weko-search-ui/tests/data/ams/broken_word.docx b/modules/weko-search-ui/tests/data/ams/broken_word.docx new file mode 100644 index 0000000000..3fa5f4e582 Binary files /dev/null and b/modules/weko-search-ui/tests/data/ams/broken_word.docx differ diff --git a/modules/weko-search-ui/tests/data/ams/png_file.pdf b/modules/weko-search-ui/tests/data/ams/png_file.pdf new file mode 100644 index 0000000000..cc8d7bda54 Binary files /dev/null and b/modules/weko-search-ui/tests/data/ams/png_file.pdf differ diff --git a/modules/weko-search-ui/tests/data/ams/png_file.txt b/modules/weko-search-ui/tests/data/ams/png_file.txt new file mode 100644 index 0000000000..cc8d7bda54 Binary files /dev/null and b/modules/weko-search-ui/tests/data/ams/png_file.txt differ diff --git a/modules/weko-search-ui/tests/data/ams/sample.txt b/modules/weko-search-ui/tests/data/ams/sample.txt new file mode 100644 index 0000000000..990383c64b --- /dev/null +++ b/modules/weko-search-ui/tests/data/ams/sample.txt @@ -0,0 +1,2 @@ +This is a +text file. diff --git a/modules/weko-search-ui/tests/data/ams/with_two_extended_metadata.json b/modules/weko-search-ui/tests/data/ams/with_two_extended_metadata.json new file mode 100644 index 0000000000..eb70def6c2 --- /dev/null +++ b/modules/weko-search-ui/tests/data/ams/with_two_extended_metadata.json @@ -0,0 +1,99 @@ +{ + "@id": "./", + "@type": "Dataset", + "datePublished": "2025-10-22", + "name": "extract", + "description": "Item metadata for Item ID: 2000036. Title: extract.", + "wk:index": [ + "1623632832836" + ], + "wk:publishStatus": "public", + "wk:feedbackMail": [], + "wk:requestMail": [], + "wk:grant": [], + "wk:editMode": "Keep", + "dc:title": [ + { + "@id": "#:title_0", + "@type": "PropertyValue", + "value": "extract", + "language": "ja" + } + ], + "dc:type": { + "@id": "#:type_1", + "@type": "PropertyValue", + "rdf:resource": "departmental bulletin paper", + "value": "http://purl.org/coar/resource_type/c_6501" + }, + "hasPart": [ + { + "@id": "data/guide.pdf", + "@type": "File", + "dcterms:accessRights": "open_access", + "datePublished": "2025-10-22", + "name": "guide.pdf", + "jpcoar:extent": [ + { + "@id": "#:extent_3", + "@type": "File", + "value": "844 KB" + } + ], + "jpcoar:mimeType": "application/pdf", + "jpcoar:URI": { + "@id": "#:URI_4", + "@type": "URL", + "value": "https://192.168.56.102/record/2000036/files/guide.pdf" + }, + "wk:textExtraction": true, + "wk:extendedMetadata": true + }, + { + "@id": "data/sample.txt", + "@type": "File", + "dcterms:accessRights": "open_access", + "datePublished": "2025-10-22", + "name": "sample.txt", + "jpcoar:extent": [ + { + "@id": "#:extent_6", + "@type": "File", + "value": "51 B" + } + ], + "jpcoar:mimeType": "text/plain", + "jpcoar:URI": { + "@id": "#:URI_7", + "@type": "URL", + "value": "https://192.168.56.102/record/2000036/files/sample.txt" + }, + "wk:textExtraction": true, + "wk:extendedMetadata": true + }, + { + "@id": "data/pp.pptx", + "@type": "File", + "dcterms:accessRights": "open_access", + "datePublished": "2025-10-22", + "name": "pp.pptx", + "jpcoar:extent": [ + { + "@id": "#:extent_9", + "@type": "File", + "value": "432 KB" + } + ], + "jpcoar:mimeType": "application/vnd.openxmlformats-officedocument.presentationml.presentation", + "jpcoar:URI": { + "@id": "#:URI_10", + "@type": "URL", + "value": "https://192.168.56.102/record/2000036/files/pp.pptx" + }, + "wk:textExtraction": true, + "wk:extendedMetadata": false + } + ], + "wk:itemLinks": [], + "wk:metadataAutoFill": false +} diff --git a/modules/weko-search-ui/tests/data/ams/without_hasPart.json b/modules/weko-search-ui/tests/data/ams/without_hasPart.json new file mode 100644 index 0000000000..a4a18e1ba1 --- /dev/null +++ b/modules/weko-search-ui/tests/data/ams/without_hasPart.json @@ -0,0 +1,31 @@ +{ + "@id": "./", + "@type": "Dataset", + "datePublished": "2025-10-22", + "name": "extract", + "description": "Item metadata for Item ID: 2000036. Title: extract.", + "wk:index": [ + "1623632832836" + ], + "wk:publishStatus": "public", + "wk:feedbackMail": [], + "wk:requestMail": [], + "wk:grant": [], + "wk:editMode": "Keep", + "dc:title": [ + { + "@id": "#:title_0", + "@type": "PropertyValue", + "value": "extract", + "language": "ja" + } + ], + "dc:type": { + "@id": "#:type_1", + "@type": "PropertyValue", + "rdf:resource": "departmental bulletin paper", + "value": "http://purl.org/coar/resource_type/c_6501" + }, + "wk:itemLinks": [], + "wk:metadataAutoFill": false +} diff --git "a/modules/weko-search-ui/tests/data/ams/\343\202\265\343\203\263\343\203\227\343\203\2532.txt" "b/modules/weko-search-ui/tests/data/ams/\343\202\265\343\203\263\343\203\227\343\203\2532.txt" new file mode 100644 index 0000000000..793629ceea --- /dev/null +++ "b/modules/weko-search-ui/tests/data/ams/\343\202\265\343\203\263\343\203\227\343\203\2532.txt" @@ -0,0 +1 @@ +上限:8バイト diff --git a/modules/weko-search-ui/tests/test_mapper.py b/modules/weko-search-ui/tests/test_mapper.py index c59f587991..c3fe1173d0 100644 --- a/modules/weko-search-ui/tests/test_mapper.py +++ b/modules/weko-search-ui/tests/test_mapper.py @@ -2,9 +2,11 @@ import pytest import xmltodict import uuid +import json from datetime import date from unittest.mock import patch, MagicMock from collections import OrderedDict +from pypdfium2 import PdfiumError from weko_records.api import Mapping from weko_records.serializers.utils import get_full_mapping @@ -4817,9 +4819,10 @@ def test_to_item_metadata(self, app, db, item_type2, item_type_mapping2): # def deconstruct_json_ld(json_ld): # .tox/c1/bin/pytest --cov=weko_search_ui tests/test_mapper.py::TestJsonLdMapper::test__deconstruct_json_ld -v -vv -s --cov-branch --cov-report=xml --basetemp=/code/modules/weko-search-ui/.tox/c1/tmp - def test__deconstruct_json_ld(self, app): + def test__deconstruct_json_ld(self, app, item_type2): json_ld = json_data("data/jsonld/ro-crate-metadata.json") - deconstructed_metadata, format = JsonLdMapper._deconstruct_json_ld(json_ld) + mapper = JsonLdMapper(item_type2.model.id, None) + deconstructed_metadata, format = mapper._deconstruct_json_ld(json_ld) metadata, system_info = deconstructed_metadata[0] assert format == "ro-crate" @@ -4847,7 +4850,8 @@ def test__deconstruct_json_ld(self, app): assert not any("@type" in key for key in metadata.keys()) json_ld = json_data("data/jsonld/ro-crate-metadata2.json") - deconstructed_metadata, format = JsonLdMapper._deconstruct_json_ld(json_ld) + mapper = JsonLdMapper(item_type2.model.id, None) + deconstructed_metadata, format = mapper._deconstruct_json_ld(json_ld) thesis, system_info = deconstructed_metadata[0] assert format == "ro-crate" @@ -4877,7 +4881,8 @@ def test__deconstruct_json_ld(self, app): assert evidence["dc:type.@id"] == "http://purl.org/coar/resource_type/c_1843" with pytest.raises(ValueError) as ex: - deconstructed_metadata, format = JsonLdMapper._deconstruct_json_ld({}) + mapper = JsonLdMapper(item_type2.model.id, None) + deconstructed_metadata, format = mapper._deconstruct_json_ld({}) ex.match('Invalid json-ld format: "@context" is invalid.') # def to_rocrate_metadata(self, metadata): @@ -5279,6 +5284,103 @@ def test_to_item_metadata_ams_dict(self, app, db, item_type2): assert item_metadata["item_1749689698804"]["subitem_relation_type"] == "isVersionOf" + # def extract_extended_metadata(self, list_extracted): + # .tox/c1/bin/pytest --cov=weko_search_ui tests/test_mapper.py::TestJsonLdMapper::test_extract_extended_metadata -v -vv -s --cov-branch --cov-report=html --basetemp=/code/modules/weko-search-ui/.tox/c1/tmp + def test_extract_extended_metadata(self, app, db, item_type2, mocker): + mapper = JsonLdMapper(item_type2.model.id, None) + values = ["first", "second"] + mocker.patch.object(mapper, "extract_text_from_files", + side_effect = values) + + rocrate = json_data("data/ams/with_two_extended_metadata.json") + rocrate = mapper.extract_extended_metadata([rocrate])[0] + + ids = [part["@id"] + for part in rocrate.get("hasPart", []) + if "@id" in part] + assert ids == ["data/pp.pptx"] + + ext = rocrate["extended_metadata"]["value"] + ext = json.loads(ext) + + assert len(ext) == 2 + assert ext["data/sample.txt"] == "first" + assert ext["data/guide.pdf"] == "second" + + # without hasPart + rocrate = json_data("data/ams/without_hasPart.json") + rocrate = mapper.extract_extended_metadata([rocrate])[0] + assert "extended_metadata" not in rocrate + + # def extract_text_from_files(self, filename): + # .tox/c1/bin/pytest --cov=weko_search_ui tests/test_mapper.py::TestJsonLdMapper::test_extract_text_from_files -v -vv -s --cov-branch --cov-report=html --basetemp=/code/modules/weko-search-ui/.tox/c1/tmp + def test_extract_text_from_files(self, app, db, item_type2, mocker, tmp_path): + mapper = JsonLdMapper(item_type2.model.id, None) + + mapper.data_path = str(tmp_path) + file_content = "これは\r\nテキストファイルです\r\n" + + file_name = "サンプル.txt" + tmpfile = tmp_path / file_name + tmpfile.write_text(file_content, encoding="shift_jis") + extract_text = mapper.extract_text_from_files(file_name) + assert extract_text == file_content + + file_name = "サンプル.TXT" + tmpfile = tmp_path / file_name + tmpfile.write_text(file_content, encoding="utf-8") + extract_text = mapper.extract_text_from_files(file_name) + assert extract_text == file_content + + file_name = "サンプル.ｔｘｔ" + tmpfile = tmp_path / file_name + tmpfile.write_text(file_content, encoding="utf-8") + extract_text = mapper.extract_text_from_files(file_name) + assert extract_text == "" + + mapper.data_path = "tests/data/ams" + + app.config.update({"WEKO_DEPOSIT_FILESIZE_LIMIT": 8}) + extract_text = mapper.extract_text_from_files("sample.txt") + assert extract_text == "This is " + + app.config.update({"WEKO_DEPOSIT_FILESIZE_LIMIT": 8}) + extract_text = mapper.extract_text_from_files("サンプル2.txt") + assert extract_text == "上限:8" + + app.config.update({"WEKO_DEPOSIT_FILESIZE_LIMIT": 2 * 1024 * 1024}) + extract_text = mapper.extract_text_from_files("sample.txt") + assert extract_text == "This is a\ntext file.\n" + + with pytest.raises(ValueError) as e: + extract_text = mapper.extract_text_from_files("png_file.txt") + assert str(e.value) == "Failed to load text file: png_file.txt" + + with pytest.raises(PdfiumError) as e: + extract_text = mapper.extract_text_from_files("png_file.pdf") + assert str(e.value) == "Failed to load PDF file: png_file.pdf" + + with pytest.raises(ValueError) as e: + extract_text = mapper.extract_text_from_files("broken_word.docx") + assert str(e.value) == "Failed to load document: broken_word.docx" + + with pytest.raises(FileNotFoundError) as e: + extract_text = mapper.extract_text_from_files("not_exist.txt") + assert str(e.value) == "File Not Found: not_exist.txt" + + mocker.patch("weko_search_ui.mapper.extract_text_from_pdf", + return_value="This is a pdf file.") + mocker.patch("os.path.isfile", return_value=True) + extract_text = mapper.extract_text_from_files("pdffile.pdf") + assert extract_text == "This is a pdf file." + + mocker.patch("weko_search_ui.mapper.extract_text_with_tika", + return_value="This is a pptx file.") + extract_text = mapper.extract_text_from_files("powerpoint.pptx") + assert extract_text == "This is a pptx file." + + extract_text = mapper.extract_text_from_files("sample.other") + assert extract_text == "" def test_set_by_jsonpath(): data = {} diff --git a/modules/weko-search-ui/tests/test_query.py b/modules/weko-search-ui/tests/test_query.py index 34c8e11d1f..431d1b4da4 100644 --- a/modules/weko-search-ui/tests/test_query.py +++ b/modules/weko-search-ui/tests/test_query.py @@ -1,5 +1,7 @@ import json import copy + +import pytest from elasticsearch_dsl.query import Match, Range, Terms, Bool from mock import patch, MagicMock from werkzeug.datastructures import MultiDict @@ -947,3 +949,51 @@ def test_split_text_by_or(): assert _split_text_by_or("AAA OR　BBB | CCC") == ["AAA", "BBB", "CCC"] assert _split_text_by_or("AAA OR OR BBB") == ["AAA", "", "BBB"] assert _split_text_by_or("OR AAA |") == ["OR AAA |"] + +@pytest.mark.parametrize("fix_accessrights, accessrights, expected_key", [ + (True, "", None), # empty + (True, "open access", "open access"), # single value + (True, "embargoed access", "embargoed access"), + (True, "restricted access", "restricted access"), + (True, "metadata only access", "metadata only access"), + (True, "open access,embargoed access", "open access"), # multiple values + (True, "invalid access", None), # invalid value + (False, "open access", "open access"), # config disabled +]) +# .tox/c1/bin/pytest --cov=weko_search_ui tests/test_query.py::test_accessrights_query_param -vv -s --cov-branch --cov-report=xml --basetemp=/code/modules/weko-search-ui/.tox/c1/tmp +def test_accessrights_query_param(app, users, fix_accessrights, accessrights, expected_key, mocker): + ACCESS_RIGHTS_CHOICES = [ + 'embargoed access', + 'metadata only access', + 'open access', + 'restricted access', + ] + _data = { + 'search_type': '0', + 'accessrights': accessrights, + 'sort': 'controlnumber', + 'page': '1', + 'size': '20', + } + with app.test_client() as client: + login_user_via_session(client, email=users[3]["email"]) + search = RecordsSearch() + + with app.test_request_context(headers=[('Accept-Language','en')], data=_data): + app.config['WEKO_SEARCH_KEYWORDS_DICT'] = WEKO_SEARCH_KEYWORDS_DICT + app.config['WEKO_ADMIN_MANAGEMENT_OPTIONS'] = WEKO_ADMIN_MANAGEMENT_OPTIONS + app.config['WEKO_SEARCH_FIX_ACCESSRIGHTS'] = fix_accessrights + app.config['WEKO_ACCESS_RIGHTS_CHOICES'] = ACCESS_RIGHTS_CHOICES + mocker.patch("weko_search_ui.query.search_permission",side_effect=MockSearchPerm) + mocker.patch("weko_search_ui.permissions.search_permission",side_effect=MockSearchPerm) + app.extensions['invenio-oauth2server'] = 1 + app.extensions['invenio-queues'] = 1 + search_result, urlkwargs = default_search_factory(self=None, search=search) + query = search_result.query().to_dict() + must_result = query["query"]["bool"]["filter"][0]["bool"]["must"] + if expected_key: + assert "accessRights" in str(must_result) + assert "accessRights" in str(urlkwargs) + else: + assert "accessRights" not in str(must_result) + assert "accessRights" not in str(urlkwargs) diff --git a/modules/weko-search-ui/tests/test_rest.py b/modules/weko-search-ui/tests/test_rest.py index d7255a5356..60d366e3e2 100644 --- a/modules/weko-search-ui/tests/test_rest.py +++ b/modules/weko-search-ui/tests/test_rest.py @@ -398,6 +398,10 @@ def test_IndexSearchResourceAPI(client_rest, db_register2, db_rocrate_mapping): res = client_rest.get('/v1/records', headers=headers) assert res.status_code == 200 + headers = {'Accept-Language': 'ja,en-US;q=0.9,en;q=0.8'} + res = client_rest.get('/v1/records', headers=headers) + assert res.status_code == 200 + with patch('weko_search_ui.rest.SearchSetting.get_sort_key', return_value=False): res = client_rest.get('/v1/records') assert res.status_code == 200 diff --git a/modules/weko-search-ui/tests/test_utils.py b/modules/weko-search-ui/tests/test_utils.py index 850ebb8521..1018cbd81d 100644 --- a/modules/weko-search-ui/tests/test_utils.py +++ b/modules/weko-search-ui/tests/test_utils.py @@ -44,7 +44,6 @@ from weko_workflow.headless.activity import HeadlessActivity from weko_workflow.models import Activity, WorkFlow - from weko_search_ui.config import ( ACCESS_RIGHT_TYPE_URI, RESOURCE_TYPE_URI, @@ -76,6 +75,7 @@ delete_records, execute_search_with_pagination, export_all, + fix_aggregations_accessrights, get_retry_info, generate_metadata_from_jpcoar, get_change_identifier_mode_content, @@ -1006,7 +1006,8 @@ def test_handle_convert_validate_msg_to_jp(i18n_app): # def handle_validate_item_import(list_record, schema) -> list: -def test_handle_validate_item_import(app, mocker_itemtype): +# .tox/c1/bin/pytest --cov=weko_search_ui tests/test_utils.py::test_handle_validate_item_import -vv -s --cov-branch --cov-report=term --basetemp=/code/modules/weko-search-ui/.tox/c1/tmp +def test_handle_validate_item_import(app, mocker_itemtype, mocker): filepath = os.path.join( os.path.dirname(os.path.realpath(__file__)), "data", "csv", "data.json" ) @@ -1040,6 +1041,96 @@ def test_handle_validate_item_import(app, mocker_itemtype): == result ) + schema = { + "type": "object", + "properties": { + "item_xxx": { + "type": "object", + "properties": { + "subitem_yyy": { + "type": "array", + "items": { + "type": "object", + "properties": { + "subitem_zzz": { + "type": "string", + } + } + } + } + } + } + } + } + + list_record = [ + { + "metadata": { + 'item_xxx': { + 'subitem_yyy':[ + {"subitem_zzz": 123} + ] + } + } + } + ] + with app.test_request_context(): + with set_locale("en"): + result = handle_validate_item_import(list_record, schema) + warnings = result[0].get("warnings", []) + target = list_record[0]["metadata"]['item_xxx']['subitem_yyy'][0]["subitem_zzz"] + assert any("Replace value of" in w for w in warnings) + assert any("is different from existing" in w for w in warnings) + assert type(target) == str + + list_record[0]["metadata"]['item_xxx']['subitem_yyy'][0]["subitem_zzz"] = 456 + + with app.test_request_context(): + with set_locale("ja"): + result = handle_validate_item_import(list_record, schema) + warnings = result[0].get("warnings", []) + assert any("へ置き換えました。" in w for w in warnings) + assert any("と異なっています。" in w for w in warnings) + + schema = { + "type": "object", + "properties": { + "item_aaa": { + "type": "object", + "properties": { + "subitem_bbb": { + "type": "object", + "properties": { + "subitem_ccc": { + "enum": [None, "Yes|Yes", "No|No"], + } + } + } + } + } + } + } + + list_record = [ + { + "metadata": { + 'item_aaa': { + 'subitem_bbb': { + "subitem_ccc": "Yes" + } + } + } + } + ] + with app.test_request_context(): + with set_locale("en"): + result = handle_validate_item_import(list_record, schema) + assert "errors" in result[0] + + with app.test_request_context(): + with set_locale("ja"): + result = handle_validate_item_import(list_record, schema) + assert "errors" in result[0] # def represents_int(s): def test_represents_int(): @@ -6125,3 +6216,69 @@ def test_none_scheme(self, mock_settings, app, db): handle_check_authors_affiliation(list_record) assert "errors" not in list_record[0] + +# .tox/c1/bin/pytest --cov=weko_search_ui tests/test_utils.py::test_fix_aggregations_accessrights -v -vv -s --cov-branch --cov-report=term --basetemp=/code/modules/weko-search-ui/.tox/c1/tmp +def test_fix_aggregations_accessrights(app, mocker): + # 1. When the flag is OFF, the aggregation result is returned as is. + with app.app_context(): + app.config["WEKO_SEARCH_FIX_ACCESSRIGHTS"] = False + app.config["WEKO_ACCESS_RIGHTS_CHOICES"] = ["embargoed access", "metadata only access", "open access", "restricted access"] + mocker.patch("weko_search_ui.utils.FacetSearchSetting.get_activated_facets_mapping", return_value={"access": "accessRights"}) + aggs = {"access": {"buckets": []}} + data = {"aggregations": aggs.copy()} + result = fix_aggregations_accessrights(data.copy()) + assert result["aggregations"] == aggs # No change when the flag is OFF + + # 2. If the mapping is not accessRights, new_accessRights remains. + with app.app_context(): + app.config["WEKO_SEARCH_FIX_ACCESSRIGHTS"] = True + app.config["WEKO_ACCESS_RIGHTS_CHOICES"] = ["embargoed access", "metadata only access", "open access", "restricted access"] + mocker.patch("weko_search_ui.utils.FacetSearchSetting.get_activated_facets_mapping", return_value={"other": "notAccessRights"}) + aggs = {"access": {"buckets": []}, "new_accessRights": {"buckets": {}}} + data = {"aggregations": aggs.copy()} + result = fix_aggregations_accessrights(data.copy()) + assert "new_accessRights" in result["aggregations"] # new_accessRights remains if mapping does not match + assert result["aggregations"]["access"] == {"buckets": []} + + # 3. If new_accessRights does not exist, return as is. + with app.app_context(): + app.config["WEKO_SEARCH_FIX_ACCESSRIGHTS"] = True + app.config["WEKO_ACCESS_RIGHTS_CHOICES"] = ["embargoed access", "metadata only access", "open access", "restricted access"] + mocker.patch("weko_search_ui.utils.FacetSearchSetting.get_activated_facets_mapping", return_value={"access": "accessRights"}) + aggs = {"access": {"buckets": []}} + data = {"aggregations": aggs.copy()} + result = fix_aggregations_accessrights(data.copy()) + assert result["aggregations"] == aggs # No change if new_accessRights does not exist + + # 4. If ACCESS_RIGHTS_CHOICES are not in new_accessRights buckets, new_accessRights remains. + with app.app_context(): + app.config["WEKO_SEARCH_FIX_ACCESSRIGHTS"] = True + app.config["WEKO_ACCESS_RIGHTS_CHOICES"] = ["embargoed access", "metadata only access", "open access", "restricted access"] + mocker.patch("weko_search_ui.utils.FacetSearchSetting.get_activated_facets_mapping", return_value={"access": "accessRights"}) + aggs = {"access": {"buckets": []}, "new_accessRights": {"buckets": {}}} + data = {"aggregations": aggs.copy()} + result = fix_aggregations_accessrights(data.copy()) + assert "new_accessRights" in result["aggregations"] # new_accessRights remains if ACCESS_RIGHTS_CHOICES not in buckets + assert result["aggregations"]["access"] == {"buckets": []} + + # 5. If doc_count is 0, new_accessRights remains. + with app.app_context(): + app.config["WEKO_SEARCH_FIX_ACCESSRIGHTS"] = True + app.config["WEKO_ACCESS_RIGHTS_CHOICES"] = ["embargoed access", "metadata only access", "open access", "restricted access"] + mocker.patch("weko_search_ui.utils.FacetSearchSetting.get_activated_facets_mapping", return_value={"access": "accessRights"}) + aggs = {"access": {"buckets": []}, "new_accessRights": {"buckets": {"open access": {"doc_count": 0}}}} + data = {"aggregations": aggs.copy()} + result = fix_aggregations_accessrights(data.copy()) + assert "new_accessRights" in result["aggregations"] # new_accessRights remains if doc_count is 0 + assert result["aggregations"]["access"] == {"buckets": []} + + # 6. Normal case: If doc_count > 0, accessrights are set in buckets and new_accessRights is removed. + with app.app_context(): + app.config["WEKO_SEARCH_FIX_ACCESSRIGHTS"] = True + app.config["WEKO_ACCESS_RIGHTS_CHOICES"] = ["embargoed access", "metadata only access", "open access", "restricted access"] + mocker.patch("weko_search_ui.utils.FacetSearchSetting.get_activated_facets_mapping", return_value={"access": "accessRights"}) + aggs = {"access": {"buckets": []}, "new_accessRights": {"buckets": {"open access": {"doc_count": 2}, "embargoed access": {"doc_count": 1}}}} + data = {"aggregations": aggs.copy()} + result = fix_aggregations_accessrights(data.copy()) + assert "new_accessRights" not in result["aggregations"] # new_accessRights is removed in normal case + assert result["aggregations"]["access"] == {"buckets": [{"key": "embargoed access", "doc_count": 1}, {"key": "open access", "doc_count": 2}]} diff --git a/modules/weko-search-ui/weko_search_ui/config.py b/modules/weko-search-ui/weko_search_ui/config.py index 6869fca640..d200c02707 100644 --- a/modules/weko-search-ui/weko_search_ui/config.py +++ b/modules/weko-search-ui/weko_search_ui/config.py @@ -780,3 +780,8 @@ ROCRATE_METADATA_WK_CONTEXT_V1 = "http://purl.org/wk/v1/wk-context.jsonld" """ Metadata context file name for RO-Crate+Bagit. """ + +WEKO_ACCESS_RIGHTS_CHOICES = [ "embargoed access", "metadata only access", "open access", "restricted access"] + +WEKO_SEARCH_FIX_ACCESSRIGHTS = False +""" If true, the value of accessrights will be modified. """ diff --git a/modules/weko-search-ui/weko_search_ui/mapper.py b/modules/weko-search-ui/weko_search_ui/mapper.py index aaa343878d..bfa57ac489 100644 --- a/modules/weko-search-ui/weko_search_ui/mapper.py +++ b/modules/weko-search-ui/weko_search_ui/mapper.py @@ -11,6 +11,9 @@ import os import re import json +import chardet +import mimetypes +from pypdfium2 import PdfiumError import itertools import xmltodict import traceback @@ -28,6 +31,7 @@ Mapping, ItemTypes, FeedbackMailList, RequestMailList, ItemLink ) from weko_records.serializers.utils import get_full_mapping +from weko_deposit.utils import extract_text_from_pdf, extract_text_with_tika from .config import ROCRATE_METADATA_FILE, ROCRATE_METADATA_WK_CONTEXT_V1 @@ -1571,8 +1575,7 @@ def is_url(s: str) -> bool: # } return mapped_metadata, system_info - @classmethod - def _deconstruct_json_ld(cls, json_ld): + def _deconstruct_json_ld(self, json_ld): """Deconstruct json-ld. Deconstructing json-ld metadata values ​​one by one @@ -1682,10 +1685,11 @@ def _resolve_link(value): list_extracted = [ extracted ] else: list_extracted = [ extracted ] + self.extract_extended_metadata(list_extracted) list_deconstructed = [] for extracted in list_extracted: - metadata = cls._deconstruct_dict(extracted) + metadata = self._deconstruct_dict(extracted) system_info = {} system_info.update( {"id": metadata.pop("identifier")} @@ -1863,6 +1867,91 @@ def _check_settable_path(self, json_path): return settable_path + def extract_extended_metadata(self, list_extracted): + """ + Store the content of files with wk:extendedMetadata set to True in extended_metadata, + and remove files with wk:extendedMetadata set to True from hasPart. + + Args: + list_extracted (list): List of extracted metadata dictionaries. + Returns: + list: The updated list of extracted metadata with extended metadata merged. + """ + for extracted in list_extracted: + extracted.pop('extended_metadata', None) + if 'hasPart' not in extracted: + continue + file_indices = [ + idx for idx, item in enumerate(extracted['hasPart']) + if item.get('wk:extendedMetadata') is True + ] + if not file_indices: + continue + extended_metadatas = {} + extracted['extended_metadata'] = {} + for idx in reversed(file_indices): + filename = extracted['hasPart'].pop(idx).get('@id') + content = self.extract_text_from_files(filename) + extended_metadatas[filename] = content + extracted['extended_metadata']['value'] = json.dumps( + extended_metadatas, ensure_ascii=False) + return list_extracted + + def extract_text_from_files(self, filename): + """ + Extract text content from the specified file, + only if the file is of a specific MIME type. + Args: + filename (str): The name of the file to extract text from. + + Returns: + str: The extracted text content from the file. + """ + data_path = self.data_path + try: + file_path = os.path.join(data_path, filename) + if not os.path.isfile(file_path): + raise FileNotFoundError + data = "" + mimetype = mimetypes.guess_type(filename)[0] + file_size_limit = current_app.config['WEKO_DEPOSIT_FILESIZE_LIMIT'] + # List of text-based MIME types allowed for text extraction and processing. + text_mimetypes = current_app.config["WEKO_DEPOSIT_TEXTMIMETYPE_WHITELIST_FOR_ES"] + # All mimetypes subject to text extraction (including text_mimetypes) + extract_mimetypes = current_app.config["WEKO_MIMETYPE_WHITELIST_FOR_ES"] + if mimetype not in extract_mimetypes: + return data + + # Extract content from file + current_app.logger.debug(f"extracting content from {filename}") + if mimetype in text_mimetypes: + with open(file_path, "rb") as fp: + data = fp.read(file_size_limit) + inf = chardet.detect(data) + if inf["encoding"] is None: + raise ValueError( + f"Failed to load text file: {filename}") + data = data.decode(inf["encoding"], errors="replace") + elif mimetype == 'application/pdf': + data = extract_text_from_pdf(file_path, file_size_limit) + else: + try: + data = extract_text_with_tika(file_path, file_size_limit) + except Exception as e: + current_app.logger.error(e) + traceback.print_exc() + raise ValueError( + f"Failed to load document: {filename}") from e + except FileNotFoundError as e: + current_app.logger.error(e) + traceback.print_exc() + raise FileNotFoundError(f"File Not Found: {filename}") from e + except PdfiumError as e: + current_app.logger.error(e) + traceback.print_exc() + raise PdfiumError(f"Failed to load PDF file: {filename}") from e + return data + def to_rocrate_metadata( self, record_metadata=None, tsv_row_metadata=None, **kwargs ): @@ -2461,4 +2550,3 @@ def tokenize_jsonpath(json_path): index = None tokens.append((element, index, current_path)) return tokens - diff --git a/modules/weko-search-ui/weko_search_ui/query.py b/modules/weko-search-ui/weko_search_ui/query.py index 678a66d8e7..fac34f7bea 100644 --- a/modules/weko-search-ui/weko_search_ui/query.py +++ b/modules/weko-search-ui/weko_search_ui/query.py @@ -603,6 +603,139 @@ def _get_geo_shape_query(k, v, params): return qry + def __get_accessrights_query(params): + """ + Build accessrights search query from request params. + Args: + params (dict): request parameters + Returns: + dict: accessrights search query + """ + weko_search_fix_accessrights = current_app.config.get( + 'WEKO_SEARCH_FIX_ACCESSRIGHTS', False + ) + + accessrights_value = params.get('accessrights') + if not accessrights_value: + return None + + accessrights_list = [v.strip() for v in accessrights_value.split(',') if v.strip()] + weko_access_rights_choices = current_app.config.get( + 'WEKO_ACCESS_RIGHTS_CHOICES', [ + 'embargoed access', + 'metadata only access', + 'open access', + 'restricted access', + ] + ) + accessrights_list = [ + v for v in accessrights_list if v in weko_access_rights_choices + ] + if not accessrights_list: + return None + + if not weko_search_fix_accessrights: + if len(accessrights_list) == 1: + return Q('term', accessRights=accessrights_list[0]) + else: + return Q('terms', accessRights=accessrights_list) + + now = datetime.now().isoformat() + + def open_access_query(now): + """Query for open access.""" + return Q( + 'bool', + should=[ + Q('term', accessRights='open access'), + Q('bool', must=[ + Q('term', accessRights='embargoed access'), + Q('nested', path='content', query=Q('exists', field='content.accessrole.raw')), + Q('bool', must_not=[ + Q('nested', path='content', query=Q('bool', must_not=[ + Q('term', **{'content.accessrole.raw': 'open_access'}), + Q('bool', must=[ + Q('term', **{'content.accessrole.raw': 'open_date'}), + Q('range', **{'content.date.dateValue.raw': {'lte': now}}) + ]) + ])) + ]) + ]) + ] + ) + + def embargoed_access_query(now): + """Query for embargoed access.""" + return Q( + 'bool', + must=[ + Q('term', accessRights='embargoed access'), + Q('bool', should=[ + Q('nested', path='content', query=Q('bool', must=[ + Q('term', **{'content.accessrole.raw': 'open_date'}), + Q('range', **{'content.date.dateValue.raw': {'gt': now}}) + ])), + Q('bool', must=[ + Q('nested', path='content', query=Q('term', **{'content.accessrole.raw': 'open_no'})) + ], must_not=[ + Q('nested', path='content', query=Q('term', **{'content.accessrole.raw': 'open_login'})) + ]), + Q('bool', must_not=[ + Q('nested', path='content', query=Q('exists', field='content.accessrole.raw')) + ]) + ]) + ], + must_not=[ + Q('nested', path='content', query=Q('term', **{'content.accessrole.raw': 'open_restricted'})), + ] + ) + + def restricted_access_query(now): + """Query for restricted access.""" + return Q( + 'bool', + should=[ + Q('term', accessRights='restricted access'), + Q('bool', must=[ + Q('term', accessRights='embargoed access'), + Q( + 'nested', path='content', + query=Q('term', **{'content.accessrole.raw': 'open_login'}) + ), + Q('bool', must_not=[ + Q('nested', path='content', query=Q('bool', must=[ + Q('term', **{'content.accessrole.raw': 'open_date'}), + Q('range', **{'content.date.dateValue.raw': {'gt': now}}) + ])) + ]) + ]), + Q('bool', must=[ + Q('term', accessRights='embargoed access'), + Q('nested', path='content', query=Q('term', **{'content.accessrole.raw': 'open_restricted'})) + ]) + ] + ) + + def metadata_only_query(): + """Query for metadata only access.""" + return Q('term', accessRights='metadata only access') + + queries = [] + for accessright in accessrights_list: + if accessright == 'open access': + queries.append(open_access_query(now)) + elif accessright == 'embargoed access': + queries.append(embargoed_access_query(now)) + elif accessright == 'restricted access': + queries.append(restricted_access_query(now)) + elif accessright == 'metadata only access': + queries.append(metadata_only_query()) + + queries = [q for q in queries if q is not None] + if len(queries) == 1: + return queries[0] + return Q('bool', should=queries, minimum_should_match=1) + params = request.values.to_dict() if additional_params: params.update(additional_params) @@ -665,6 +798,10 @@ def _get_geo_shape_query(k, v, params): if qy: mut.append(qy) + accessrights_q = __get_accessrights_query(params) + if accessrights_q: + mut.append(accessrights_q) + except Exception as e: current_app.logger.exception( "Detail search query parser failed. err:{0}".format(e) @@ -1381,4 +1518,4 @@ def _split_text_by_or(text): pattern = r'(?<= )(?:OR|\|)(?= )' split_text_list = re.split(pattern, text) split_text_list = [item.strip() for item in split_text_list] - return split_text_list \ No newline at end of file + return split_text_list diff --git a/modules/weko-search-ui/weko_search_ui/rest.py b/modules/weko-search-ui/weko_search_ui/rest.py index ee0095b6c8..2e797275cc 100644 --- a/modules/weko-search-ui/weko_search_ui/rest.py +++ b/modules/weko-search-ui/weko_search_ui/rest.py @@ -600,6 +600,8 @@ def get_v1(self, **kwargs): try: # Language setting language = request.headers.get('Accept-Language') + if isinstance(language, str): + language = language.split(',')[0].split(';')[0].strip() if language: get_locale().language = language diff --git a/modules/weko-search-ui/weko_search_ui/translations/en/LC_MESSAGES/messages.mo b/modules/weko-search-ui/weko_search_ui/translations/en/LC_MESSAGES/messages.mo index 084df4f48b..cb7fc7ab93 100644 Binary files a/modules/weko-search-ui/weko_search_ui/translations/en/LC_MESSAGES/messages.mo and b/modules/weko-search-ui/weko_search_ui/translations/en/LC_MESSAGES/messages.mo differ diff --git a/modules/weko-search-ui/weko_search_ui/translations/en/LC_MESSAGES/messages.po b/modules/weko-search-ui/weko_search_ui/translations/en/LC_MESSAGES/messages.po index d4ba275c83..5a50d17255 100644 --- a/modules/weko-search-ui/weko_search_ui/translations/en/LC_MESSAGES/messages.po +++ b/modules/weko-search-ui/weko_search_ui/translations/en/LC_MESSAGES/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: weko-search-ui 0.1.0.dev20170000\n" "Report-Msgid-Bugs-To: wekosoftware@nii.ac.jp\n" -"POT-Creation-Date: 2025-11-11 20:49+0900\n" +"POT-Creation-Date: 2025-12-17 13:33+0900\n" "PO-Revision-Date: 2025-04-09 23:22+0900\n" "Last-Translator: FULL NAME \n" "Language: en\n" @@ -19,69 +19,69 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 2.5.1\n" -#: tests/conftest.py:400 +#: tests/conftest.py:406 msgid "write your own license" msgstr "" -#: tests/conftest.py:405 +#: tests/conftest.py:411 msgid "Creative Commons CC0 1.0 Universal Public Domain Designation" msgstr "" -#: tests/conftest.py:421 +#: tests/conftest.py:427 msgid "Creative Commons Attribution 3.0 Unported (CC BY 3.0)" msgstr "" -#: tests/conftest.py:433 +#: tests/conftest.py:439 msgid "Creative Commons Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0)" msgstr "" -#: tests/conftest.py:448 +#: tests/conftest.py:454 msgid "Creative Commons Attribution-NoDerivs 3.0 Unported (CC BY-ND 3.0)" msgstr "" -#: tests/conftest.py:462 +#: tests/conftest.py:468 msgid "Creative Commons Attribution-NonCommercial 3.0 Unported (CC BY-NC 3.0)" msgstr "" -#: tests/conftest.py:477 +#: tests/conftest.py:483 msgid "" "Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported (CC " "BY-NC-SA 3.0)" msgstr "" -#: tests/conftest.py:492 +#: tests/conftest.py:498 msgid "" "Creative Commons Attribution-NonCommercial-NoDerivs 3.0 Unported (CC BY-" "NC-ND 3.0)" msgstr "" -#: tests/conftest.py:508 +#: tests/conftest.py:514 msgid "Creative Commons Attribution 4.0 International (CC BY 4.0)" msgstr "" -#: tests/conftest.py:520 +#: tests/conftest.py:526 msgid "Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)" msgstr "" -#: tests/conftest.py:535 +#: tests/conftest.py:541 msgid "" "Creative Commons Attribution-NoDerivatives 4.0 International (CC BY-ND " "4.0)" msgstr "" -#: tests/conftest.py:550 +#: tests/conftest.py:556 msgid "" "Creative Commons Attribution-NonCommercial 4.0 International (CC BY-NC " "4.0)" msgstr "" -#: tests/conftest.py:565 +#: tests/conftest.py:571 msgid "" "Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International " "(CC BY-NC-SA 4.0)" msgstr "" -#: tests/conftest.py:580 +#: tests/conftest.py:586 msgid "" "Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 " "International (CC BY-NC-ND 4.0)" @@ -215,42 +215,44 @@ msgstr "" msgid "Import Result" msgstr "" -#: weko_search_ui/mapper.py:1347 +#: weko_search_ui/mapper.py:1351 msgid "\"{key}\" is required." msgstr "" -#: weko_search_ui/mapper.py:1368 +#: weko_search_ui/mapper.py:1372 +#, python-brace-format msgid "\"{key}\" is not in itemtype." msgstr "" -#: weko_search_ui/mapper.py:1370 +#: weko_search_ui/mapper.py:1374 +#, python-brace-format msgid "\"{key}\" is not in itemtype, did you mean \"{similar_key}\"?" msgstr "" -#: weko_search_ui/mapper.py:1491 +#: weko_search_ui/mapper.py:1495 #, python-format msgid "" "Cannot map to item type from json-ld; Mapping is not defined for the " "metadata, \"%(key)s\": \"%(value)s\"" msgstr "" -#: weko_search_ui/mapper.py:1517 +#: weko_search_ui/mapper.py:1521 #, python-format msgid "" "Cannot map to item type from json-ld; Not found mapping destination for " "the metadata, \"%(key)s\": \"%(value)s\"" msgstr "" -#: weko_search_ui/mapper.py:1527 +#: weko_search_ui/mapper.py:1531 #, python-format msgid "Failed to set metadata for json-ld, \"%(key)s\": \"%(value)s\"" msgstr "" -#: weko_search_ui/mapper.py:1547 +#: weko_search_ui/mapper.py:1553 msgid "Metadata which could not be mapped to item type will be set in 'Extra'." msgstr "" -#: weko_search_ui/mapper.py:1551 +#: weko_search_ui/mapper.py:1557 msgid "Metadata which could not be mapped to item type will be discarded." msgstr "" @@ -269,6 +271,7 @@ msgid "" msgstr "" #: weko_search_ui/utils.py:615 +#, python-brace-format msgid "" "The csv/tsv file was not found in the specified file {}. Check if the " "directory structure is correct." @@ -281,6 +284,7 @@ msgid "" msgstr "" #: weko_search_ui/utils.py:731 +#, python-brace-format msgid "" "The xml file was not found in the specified file {}. Check if the " "directory structure is correct." @@ -311,6 +315,7 @@ msgid "" msgstr "" #: weko_search_ui/utils.py:1244 +#, python-brace-format msgid "The item type ID specified in the {} file does not exist." msgstr "" @@ -319,24 +324,29 @@ msgid "Cannot register because the specified item type is not the latest version msgstr "" #: weko_search_ui/utils.py:1268 +#, python-brace-format msgid "The following metadata keys are duplicated.
{}" msgstr "" #: weko_search_ui/utils.py:1289 +#, python-brace-format msgid "The item does not consistent with the specified item type.
{}" msgstr "" #: weko_search_ui/utils.py:1317 +#, python-brace-format msgid "Cannot read {} file correctly." msgstr "" #: weko_search_ui/utils.py:1341 +#, python-brace-format msgid "" "The following items are not registered because they do not exist in the " "specified item type. {}" msgstr "" #: weko_search_ui/utils.py:1351 +#, python-brace-format msgid "" "The {} file could not be read. Make sure the file format is {} and that " "the file is UTF-8 encoded." @@ -348,259 +358,269 @@ msgid "" " the file is UTF-8 encoded." msgstr "" -#: weko_search_ui/utils.py:1454 +#: weko_search_ui/utils.py:1455 msgid "Please specify item ID by half-width number." msgstr "" -#: weko_search_ui/utils.py:1469 +#: weko_search_ui/utils.py:1477 +#, python-format +msgid "Replace value of %(target_path)s from %(old_value)s to '%(new_value)s'." +msgstr "" + +#: weko_search_ui/utils.py:1489 msgid "Specified item type does not exist." msgstr "" -#: weko_search_ui/utils.py:1540 +#: weko_search_ui/utils.py:1495 +#, python-format +msgid "Specified %(type)s is different from existing %(existing_type)s." +msgstr "" + +#: weko_search_ui/utils.py:1567 msgid "The same item may have been registered." msgstr "" -#: weko_search_ui/utils.py:1570 +#: weko_search_ui/utils.py:1597 msgid "Specified URI and system URI do not match." msgstr "" -#: weko_search_ui/utils.py:1582 +#: weko_search_ui/utils.py:1609 msgid "Item does not exist in the system." msgstr "" -#: weko_search_ui/utils.py:1589 +#: weko_search_ui/utils.py:1616 msgid "Item already DELETED in the system." msgstr "" -#: weko_search_ui/utils.py:1606 +#: weko_search_ui/utils.py:1633 msgid "Please specify either \"Keep\" or \"Upgrade\"." msgstr "" -#: weko_search_ui/utils.py:2565 +#: weko_search_ui/utils.py:2592 msgid "Title is required item." msgstr "" -#: weko_search_ui/utils.py:2582 +#: weko_search_ui/utils.py:2609 msgid "{} is required item." msgstr "" -#: weko_search_ui/utils.py:2585 +#: weko_search_ui/utils.py:2612 msgid "Please set \"public\" or \"private\" for {}." msgstr "" -#: weko_search_ui/utils.py:2626 +#: weko_search_ui/utils.py:2653 msgid "The specified {} does not exist in system." msgstr "" -#: weko_search_ui/utils.py:2636 +#: weko_search_ui/utils.py:2663 msgid "Specified {} does not match with existing index." msgstr "" -#: weko_search_ui/utils.py:2680 +#: weko_search_ui/utils.py:2707 msgid "Your role cannot register items in this index." msgstr "" -#: weko_search_ui/utils.py:2701 +#: weko_search_ui/utils.py:2728 msgid "Both of IndexID and POS_INDEX are not being set." msgstr "" -#: weko_search_ui/utils.py:2747 weko_search_ui/utils.py:2772 +#: weko_search_ui/utils.py:2774 weko_search_ui/utils.py:2799 msgid "Specified {} is invalid." msgstr "" -#: weko_search_ui/utils.py:2806 +#: weko_search_ui/utils.py:2833 msgid "If there is a info of content file, terms of use cannot be set." msgstr "If there is a info of content file, terms of use cannot be set." -#: weko_search_ui/utils.py:2813 weko_search_ui/utils.py:6063 +#: weko_search_ui/utils.py:2840 weko_search_ui/utils.py:6090 msgid "The specified provinding method does not exist in the system" msgstr "" -#: weko_search_ui/utils.py:2818 weko_search_ui/utils.py:6058 +#: weko_search_ui/utils.py:2845 weko_search_ui/utils.py:6085 msgid "The specified terms does not exist in the system" msgstr "" -#: weko_search_ui/utils.py:2910 weko_search_ui/utils.py:2943 -#: weko_search_ui/utils.py:3035 weko_search_ui/utils.py:3147 -#: weko_search_ui/utils.py:3169 weko_search_ui/utils.py:3204 +#: weko_search_ui/utils.py:2937 weko_search_ui/utils.py:2970 +#: weko_search_ui/utils.py:3062 weko_search_ui/utils.py:3174 +#: weko_search_ui/utils.py:3196 weko_search_ui/utils.py:3231 msgid "Please specify {}." msgstr "" -#: weko_search_ui/utils.py:2913 weko_search_ui/utils.py:3150 +#: weko_search_ui/utils.py:2940 weko_search_ui/utils.py:3177 msgid "The specified {} exceeds the maximum length." msgstr "" -#: weko_search_ui/utils.py:2928 weko_search_ui/utils.py:3085 -#: weko_search_ui/utils.py:3096 weko_search_ui/utils.py:3165 +#: weko_search_ui/utils.py:2955 weko_search_ui/utils.py:3112 +#: weko_search_ui/utils.py:3123 weko_search_ui/utils.py:3192 msgid "Specified Prefix of {} is incorrect." msgstr "" -#: weko_search_ui/utils.py:2936 weko_search_ui/utils.py:3079 -#: weko_search_ui/utils.py:3089 +#: weko_search_ui/utils.py:2963 weko_search_ui/utils.py:3106 +#: weko_search_ui/utils.py:3116 msgid "{} cannot be set." msgstr "" -#: weko_search_ui/utils.py:2945 weko_search_ui/utils.py:2949 -#: weko_search_ui/utils.py:3018 weko_search_ui/utils.py:3206 +#: weko_search_ui/utils.py:2972 weko_search_ui/utils.py:2976 +#: weko_search_ui/utils.py:3045 weko_search_ui/utils.py:3233 msgid "Specified {} is different from existing {}." msgstr "" -#: weko_search_ui/utils.py:2969 +#: weko_search_ui/utils.py:2996 msgid "" "When assigning a DOI to an item, it must be associated with an index " "whose index status is \"Public\" and Harvest Publishing is \"Public\"." msgstr "" -#: weko_search_ui/utils.py:2974 +#: weko_search_ui/utils.py:3001 msgid "" "Since the item has a DOI, it must be associated with an index whose index" " status is \"Public\" and whose Harvest Publishing is \"Public\"." msgstr "" -#: weko_search_ui/utils.py:2985 +#: weko_search_ui/utils.py:3012 msgid "You cannot keep an item private because it has a DOI." msgstr "" -#: weko_search_ui/utils.py:3039 weko_search_ui/utils.py:4335 +#: weko_search_ui/utils.py:3066 weko_search_ui/utils.py:4362 msgid "DOI_RA should be set by one of JaLC, Crossref, DataCite, NDL JaLC." msgstr "" -#: weko_search_ui/utils.py:3122 +#: weko_search_ui/utils.py:3149 msgid "Specified DOI was withdrawn. Please specify another DOI." msgstr "" -#: weko_search_ui/utils.py:3130 +#: weko_search_ui/utils.py:3157 msgid "" "Specified DOI has been used already for another item. Please specify " "another DOI." msgstr "" -#: weko_search_ui/utils.py:3226 +#: weko_search_ui/utils.py:3253 msgid "" "Specified DOI is duplicated with another import item. Please specify " "another DOI." msgstr "" -#: weko_search_ui/utils.py:3259 +#: weko_search_ui/utils.py:3286 msgid "Item Link type: '{}' is not one of {}." msgstr "" -#: weko_search_ui/utils.py:3263 +#: weko_search_ui/utils.py:3290 msgid "Please specify Item URL for item link." msgstr "" -#: weko_search_ui/utils.py:3277 +#: weko_search_ui/utils.py:3304 msgid "Specified Item Link URI and system URI do not match." msgstr "" -#: weko_search_ui/utils.py:3283 +#: weko_search_ui/utils.py:3310 msgid "Linking item does not exist in the system." msgstr "" -#: weko_search_ui/utils.py:3286 +#: weko_search_ui/utils.py:3313 msgid "Linking item already deleted in the system." msgstr "" -#: weko_search_ui/utils.py:3325 +#: weko_search_ui/utils.py:3352 msgid "It is not allowed to create links to the item itself." msgstr "" -#: weko_search_ui/utils.py:3330 +#: weko_search_ui/utils.py:3357 msgid "It is not allowed to create links other than {} between split items." msgstr "" -#: weko_search_ui/utils.py:3366 +#: weko_search_ui/utils.py:3393 msgid "Duplicate Item Link." msgstr "" -#: weko_search_ui/utils.py:3403 +#: weko_search_ui/utils.py:3430 msgid "'wk:metadataReplace' flag cannot be used when registering an item." msgstr "" -#: weko_search_ui/utils.py:3720 +#: weko_search_ui/utils.py:3747 msgid "" "One of the following required values ​​has not been " "registered.
{}
" msgstr "" -#: weko_search_ui/utils.py:3725 +#: weko_search_ui/utils.py:3752 msgid "" "The mapping of required items for DOI validation is not set. Please " "recheck the following mapping settings.
{}" msgstr "" -#: weko_search_ui/utils.py:3735 +#: weko_search_ui/utils.py:3762 msgid "The following metadata are required.
{}" msgstr "" -#: weko_search_ui/utils.py:3740 +#: weko_search_ui/utils.py:3767 msgid "One of the following metadata is required.
{}
" msgstr "" -#: weko_search_ui/utils.py:3803 weko_search_ui/utils.py:3815 +#: weko_search_ui/utils.py:3830 weko_search_ui/utils.py:3842 msgid "Please specify the date with any format of YYYY-MM-DD, YYYY-MM, YYYY." msgstr "" -#: weko_search_ui/utils.py:3809 +#: weko_search_ui/utils.py:3836 msgid "Replace value of {} from {} to {}." msgstr "" -#: weko_search_ui/utils.py:3832 +#: weko_search_ui/utils.py:3859 msgid "Please specify PubDate with YYYY-MM-DD." msgstr "" -#: weko_search_ui/utils.py:3862 +#: weko_search_ui/utils.py:3889 msgid "ID is specified for the newly registered item. Ignore the ID and register." msgstr "" -#: weko_search_ui/utils.py:3945 +#: weko_search_ui/utils.py:3972 msgid "Please specify Open Access Date with YYYY-MM-DD." msgstr "" -#: weko_search_ui/utils.py:4172 weko_search_ui/utils.py:4320 -#: weko_search_ui/utils.py:4326 +#: weko_search_ui/utils.py:4199 weko_search_ui/utils.py:4347 +#: weko_search_ui/utils.py:4353 msgid "Please specify DOI prefix/suffix." msgstr "" -#: weko_search_ui/utils.py:4312 +#: weko_search_ui/utils.py:4339 msgid "The specified DOI is wrong and fixed with the registered DOI." msgstr "" -#: weko_search_ui/utils.py:4315 +#: weko_search_ui/utils.py:4342 msgid "" "The specified DOI RA is wrong and fixed with the correct DOI RA of the " "registered DOI." msgstr "" -#: weko_search_ui/utils.py:4322 weko_search_ui/utils.py:4328 +#: weko_search_ui/utils.py:4349 weko_search_ui/utils.py:4355 msgid "Please specify DOI suffix." msgstr "" -#: weko_search_ui/utils.py:4331 +#: weko_search_ui/utils.py:4358 msgid "Do not specify DOI suffix." msgstr "" -#: weko_search_ui/utils.py:4337 +#: weko_search_ui/utils.py:4364 msgid "Specified Prefix of DOI is incorrect." msgstr "" -#: weko_search_ui/utils.py:4369 +#: weko_search_ui/utils.py:4396 msgid "" "Please specify the image file(gif, jpg, jpe, jpeg, png, bmp, tiff, tif) " "for the thumbnail." msgstr "" -#: weko_search_ui/utils.py:5490 +#: weko_search_ui/utils.py:5517 msgid "The file specified in ({}) does not exist." msgstr "" -#: weko_search_ui/utils.py:5494 +#: weko_search_ui/utils.py:5521 msgid "" "The file specified in ({}) does not exist.
The file will not be " "updated. Update only the metadata with csv/tsv contents." msgstr "" -#: weko_search_ui/utils.py:5781 +#: weko_search_ui/utils.py:5808 msgid "The file name specified in {} and {} do not match." msgstr "" @@ -1181,3 +1201,51 @@ msgstr "" msgid "Failed to get mapping list." msgstr "" +#~ msgid "Bagging a parent of the current directory is not supported" +#~ msgstr "" + +#~ msgid "Creating tag for directory %s" +#~ msgstr "" + +#~ msgid "Bag directory %s does not exist" +#~ msgstr "" + +#~ msgid "Bag directory %s does not contain a data directory" +#~ msgstr "" + +#~ msgid "" +#~ "Unable to write to the following directories and files:\n" +#~ "%s" +#~ msgstr "" + +#~ msgid "Missing permissions to move all files and directories" +#~ msgstr "" + +#~ msgid "" +#~ "The following directories do not have read permissions:\n" +#~ "%s" +#~ msgstr "" + +#~ msgid "" +#~ "The following files do not have read permissions:\n" +#~ "%s" +#~ msgstr "" + +#~ msgid "Read permissions are required to calculate file fixities" +#~ msgstr "" + +#~ msgid "Creating data directory" +#~ msgstr "" + +#~ msgid "Creating bagit.txt" +#~ msgstr "" + +#~ msgid "Creating bag-info.txt" +#~ msgstr "" + +#~ msgid "An error occurred creating a bag in %s" +#~ msgstr "" + +#~ msgid "`wk:metadata_replace` flag cannot be used in RO-Crate Import." +#~ msgstr "" + diff --git a/modules/weko-search-ui/weko_search_ui/translations/ja/LC_MESSAGES/messages.mo b/modules/weko-search-ui/weko_search_ui/translations/ja/LC_MESSAGES/messages.mo index 00ad3d906f..1c69f06441 100644 Binary files a/modules/weko-search-ui/weko_search_ui/translations/ja/LC_MESSAGES/messages.mo and b/modules/weko-search-ui/weko_search_ui/translations/ja/LC_MESSAGES/messages.mo differ diff --git a/modules/weko-search-ui/weko_search_ui/translations/ja/LC_MESSAGES/messages.po b/modules/weko-search-ui/weko_search_ui/translations/ja/LC_MESSAGES/messages.po index 0d30ef2d92..4a7b646a60 100644 --- a/modules/weko-search-ui/weko_search_ui/translations/ja/LC_MESSAGES/messages.po +++ b/modules/weko-search-ui/weko_search_ui/translations/ja/LC_MESSAGES/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: weko-search-ui 0.1.0.dev20170000\n" "Report-Msgid-Bugs-To: wekosoftware@nii.ac.jp\n" -"POT-Creation-Date: 2025-11-11 20:49+0900\n" +"POT-Creation-Date: 2025-12-17 13:33+0900\n" "PO-Revision-Date: 2025-04-09 22:35+0900\n" "Last-Translator: FULL NAME \n" "Language: ja\n" @@ -19,69 +19,69 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 2.5.1\n" -#: tests/conftest.py:400 +#: tests/conftest.py:406 msgid "write your own license" msgstr "" -#: tests/conftest.py:405 +#: tests/conftest.py:411 msgid "Creative Commons CC0 1.0 Universal Public Domain Designation" msgstr "" -#: tests/conftest.py:421 +#: tests/conftest.py:427 msgid "Creative Commons Attribution 3.0 Unported (CC BY 3.0)" msgstr "" -#: tests/conftest.py:433 +#: tests/conftest.py:439 msgid "Creative Commons Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0)" msgstr "" -#: tests/conftest.py:448 +#: tests/conftest.py:454 msgid "Creative Commons Attribution-NoDerivs 3.0 Unported (CC BY-ND 3.0)" msgstr "" -#: tests/conftest.py:462 +#: tests/conftest.py:468 msgid "Creative Commons Attribution-NonCommercial 3.0 Unported (CC BY-NC 3.0)" msgstr "" -#: tests/conftest.py:477 +#: tests/conftest.py:483 msgid "" "Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported (CC " "BY-NC-SA 3.0)" msgstr "" -#: tests/conftest.py:492 +#: tests/conftest.py:498 msgid "" "Creative Commons Attribution-NonCommercial-NoDerivs 3.0 Unported (CC BY-" "NC-ND 3.0)" msgstr "" -#: tests/conftest.py:508 +#: tests/conftest.py:514 msgid "Creative Commons Attribution 4.0 International (CC BY 4.0)" msgstr "" -#: tests/conftest.py:520 +#: tests/conftest.py:526 msgid "Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)" msgstr "" -#: tests/conftest.py:535 +#: tests/conftest.py:541 msgid "" "Creative Commons Attribution-NoDerivatives 4.0 International (CC BY-ND " "4.0)" msgstr "" -#: tests/conftest.py:550 +#: tests/conftest.py:556 msgid "" "Creative Commons Attribution-NonCommercial 4.0 International (CC BY-NC " "4.0)" msgstr "" -#: tests/conftest.py:565 +#: tests/conftest.py:571 msgid "" "Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International " "(CC BY-NC-SA 4.0)" msgstr "" -#: tests/conftest.py:580 +#: tests/conftest.py:586 msgid "" "Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 " "International (CC BY-NC-ND 4.0)" @@ -215,42 +215,42 @@ msgstr "ステータス" msgid "Import Result" msgstr "インポート結果" -#: weko_search_ui/mapper.py:1347 +#: weko_search_ui/mapper.py:1351 msgid "\"{key}\" is required." msgstr "「{key}」 に対応するマッピングが必要です。" -#: weko_search_ui/mapper.py:1368 +#: weko_search_ui/mapper.py:1372 msgid "\"{key}\" is not in itemtype." msgstr "「{key}」 はアイテムタイプに存在しません。" -#: weko_search_ui/mapper.py:1370 +#: weko_search_ui/mapper.py:1374 msgid "\"{key}\" is not in itemtype, did you mean \"{similar_key}\"?" msgstr "「{key}」 はアイテムタイプに存在しません。「{similar_key}」であれば存在します。" -#: weko_search_ui/mapper.py:1491 +#: weko_search_ui/mapper.py:1495 #, python-format msgid "" "Cannot map to item type from json-ld; Mapping is not defined for the " "metadata, \"%(key)s\": \"%(value)s\"" msgstr "対応するマッピングが定義されてないため、このメタデータはアイテムタイプに変換できません。\"%(key)s\": \"%(value)s\"" -#: weko_search_ui/mapper.py:1517 +#: weko_search_ui/mapper.py:1521 #, python-format msgid "" "Cannot map to item type from json-ld; Not found mapping destination for " "the metadata, \"%(key)s\": \"%(value)s\"" msgstr "マッピング先が見つからないため、このメタデータはアイテムタイプに変換できません。\"%(key)s\": \"%(value)s\"" -#: weko_search_ui/mapper.py:1527 +#: weko_search_ui/mapper.py:1531 #, python-format msgid "Failed to set metadata for json-ld, \"%(key)s\": \"%(value)s\"" msgstr "アイテムタイプへのマッピングに失敗しました。\"%(key)s\": \"%(value)s\"" -#: weko_search_ui/mapper.py:1547 +#: weko_search_ui/mapper.py:1553 msgid "Metadata which could not be mapped to item type will be set in 'Extra'." msgstr "アイテムタイプにマッピングできなかったメタデータは、「Extra」プロパティに登録されます。" -#: weko_search_ui/mapper.py:1551 +#: weko_search_ui/mapper.py:1557 msgid "Metadata which could not be mapped to item type will be discarded." msgstr "アイテムタイプにマッピングできなかったメタデータは破棄されます。" @@ -348,259 +348,269 @@ msgid "" " the file is UTF-8 encoded." msgstr "" -#: weko_search_ui/utils.py:1454 +#: weko_search_ui/utils.py:1455 msgid "Please specify item ID by half-width number." msgstr "アイテムIDは半角数字で指定してください。" -#: weko_search_ui/utils.py:1469 +#: weko_search_ui/utils.py:1477 +#, python-format +msgid "Replace value of %(target_path)s from %(old_value)s to '%(new_value)s'." +msgstr "%(target_path)sの値を%(old_value)sから'%(new_value)s'へ置き換えました。" + +#: weko_search_ui/utils.py:1489 msgid "Specified item type does not exist." msgstr "指定されたアイテムタイプが存在していません。" -#: weko_search_ui/utils.py:1540 +#: weko_search_ui/utils.py:1495 +#, python-brace-format, python-format +msgid "Specified %(type)s is different from existing %(existing_type)s." +msgstr "指定された%(type)sは登録している%(existing_type)sと異なっています。" + +#: weko_search_ui/utils.py:1567 msgid "The same item may have been registered." msgstr "同じアイテムが登録されている可能性があります。" -#: weko_search_ui/utils.py:1570 +#: weko_search_ui/utils.py:1597 msgid "Specified URI and system URI do not match." msgstr "指定されたURIとシステムURIが一致しません。" -#: weko_search_ui/utils.py:1582 +#: weko_search_ui/utils.py:1609 msgid "Item does not exist in the system." msgstr "アイテムがシステムに存在しません。" -#: weko_search_ui/utils.py:1589 +#: weko_search_ui/utils.py:1616 msgid "Item already DELETED in the system." msgstr "アイテムは削除済です。" -#: weko_search_ui/utils.py:1606 +#: weko_search_ui/utils.py:1633 msgid "Please specify either \"Keep\" or \"Upgrade\"." msgstr "Keep、Upgradeのいずれかを指定してください。" -#: weko_search_ui/utils.py:2565 +#: weko_search_ui/utils.py:2592 msgid "Title is required item." msgstr "タイトルは必須項目です。" -#: weko_search_ui/utils.py:2582 +#: weko_search_ui/utils.py:2609 msgid "{} is required item." msgstr "{}は必須項目です。" -#: weko_search_ui/utils.py:2585 +#: weko_search_ui/utils.py:2612 msgid "Please set \"public\" or \"private\" for {}." msgstr "{}はpublic、privateのいずれかを設定してください。" -#: weko_search_ui/utils.py:2626 +#: weko_search_ui/utils.py:2653 msgid "The specified {} does not exist in system." msgstr "指定された{}はシステムに存在しません。" -#: weko_search_ui/utils.py:2636 +#: weko_search_ui/utils.py:2663 msgid "Specified {} does not match with existing index." msgstr "指定された{}はシステムのものと一致していません。" -#: weko_search_ui/utils.py:2680 +#: weko_search_ui/utils.py:2707 msgid "Your role cannot register items in this index." msgstr "ロールの権限が足りずこのインデックスにアイテム登録ができません。" -#: weko_search_ui/utils.py:2701 +#: weko_search_ui/utils.py:2728 msgid "Both of IndexID and POS_INDEX are not being set." msgstr "IndexID, POS_INDEXがどちらも設定されていません。" -#: weko_search_ui/utils.py:2747 weko_search_ui/utils.py:2772 +#: weko_search_ui/utils.py:2774 weko_search_ui/utils.py:2799 msgid "Specified {} is invalid." msgstr "指定された{}は不正です。" -#: weko_search_ui/utils.py:2806 +#: weko_search_ui/utils.py:2833 msgid "If there is a info of content file, terms of use cannot be set." msgstr "コンテンツファイル情報がある場合、利用規約は設定できません。" -#: weko_search_ui/utils.py:2813 weko_search_ui/utils.py:6063 +#: weko_search_ui/utils.py:2840 weko_search_ui/utils.py:6090 msgid "The specified provinding method does not exist in the system" msgstr "指定する提供方法はシステムに存在しません。" -#: weko_search_ui/utils.py:2818 weko_search_ui/utils.py:6058 +#: weko_search_ui/utils.py:2845 weko_search_ui/utils.py:6085 msgid "The specified terms does not exist in the system" msgstr "指定する利用規約はシステムに存在しません。" -#: weko_search_ui/utils.py:2910 weko_search_ui/utils.py:2943 -#: weko_search_ui/utils.py:3035 weko_search_ui/utils.py:3147 -#: weko_search_ui/utils.py:3169 weko_search_ui/utils.py:3204 +#: weko_search_ui/utils.py:2937 weko_search_ui/utils.py:2970 +#: weko_search_ui/utils.py:3062 weko_search_ui/utils.py:3174 +#: weko_search_ui/utils.py:3196 weko_search_ui/utils.py:3231 msgid "Please specify {}." msgstr "{}を設定してください。" -#: weko_search_ui/utils.py:2913 weko_search_ui/utils.py:3150 +#: weko_search_ui/utils.py:2940 weko_search_ui/utils.py:3177 msgid "The specified {} exceeds the maximum length." msgstr "指定された{}が最大長を超えています。" -#: weko_search_ui/utils.py:2928 weko_search_ui/utils.py:3085 -#: weko_search_ui/utils.py:3096 weko_search_ui/utils.py:3165 +#: weko_search_ui/utils.py:2955 weko_search_ui/utils.py:3112 +#: weko_search_ui/utils.py:3123 weko_search_ui/utils.py:3192 msgid "Specified Prefix of {} is incorrect." msgstr "指定された{}のPrefixが誤っています。" -#: weko_search_ui/utils.py:2936 weko_search_ui/utils.py:3079 -#: weko_search_ui/utils.py:3089 +#: weko_search_ui/utils.py:2963 weko_search_ui/utils.py:3106 +#: weko_search_ui/utils.py:3116 msgid "{} cannot be set." msgstr "{}は設定できません。" -#: weko_search_ui/utils.py:2945 weko_search_ui/utils.py:2949 -#: weko_search_ui/utils.py:3018 weko_search_ui/utils.py:3206 +#: weko_search_ui/utils.py:2972 weko_search_ui/utils.py:2976 +#: weko_search_ui/utils.py:3045 weko_search_ui/utils.py:3233 msgid "Specified {} is different from existing {}." msgstr "指定された{}は登録している{}と異なっています。" -#: weko_search_ui/utils.py:2969 +#: weko_search_ui/utils.py:2996 msgid "" "When assigning a DOI to an item, it must be associated with an index " "whose index status is \"Public\" and Harvest Publishing is \"Public\"." msgstr "" -#: weko_search_ui/utils.py:2974 +#: weko_search_ui/utils.py:3001 msgid "" "Since the item has a DOI, it must be associated with an index whose index" " status is \"Public\" and whose Harvest Publishing is \"Public\"." msgstr "アイテムにDOIが付与されているため、インデックス状態が「公開」かつハーベスト公開が「公開」のインデックスに関連付けが必要です。" -#: weko_search_ui/utils.py:2985 +#: weko_search_ui/utils.py:3012 msgid "You cannot keep an item private because it has a DOI." msgstr "アイテムにDOIが付与されているため、アイテムを非公開にすることはできません。" -#: weko_search_ui/utils.py:3039 weko_search_ui/utils.py:4335 +#: weko_search_ui/utils.py:3066 weko_search_ui/utils.py:4362 msgid "DOI_RA should be set by one of JaLC, Crossref, DataCite, NDL JaLC." msgstr "DOI_RAはJaLC,Crossref,DataCite,NDL JaLCのいずれかを設定してください。" -#: weko_search_ui/utils.py:3122 +#: weko_search_ui/utils.py:3149 msgid "Specified DOI was withdrawn. Please specify another DOI." msgstr "指定されたDOIは取り下げられました。別のDOIを指定してください。" -#: weko_search_ui/utils.py:3130 +#: weko_search_ui/utils.py:3157 msgid "" "Specified DOI has been used already for another item. Please specify " "another DOI." msgstr "指定されたDOIは既に別のアイテムに付与されています。別のDOIを指定してください。" -#: weko_search_ui/utils.py:3226 +#: weko_search_ui/utils.py:3253 msgid "" "Specified DOI is duplicated with another import item. Please specify " "another DOI." msgstr "指定されたDOIはインポートファイル内で重複しています。別のDOIを指定してください。" -#: weko_search_ui/utils.py:3259 +#: weko_search_ui/utils.py:3286 msgid "Item Link type: '{}' is not one of {}." msgstr "リンクタイプ'{}'は次の決められた選択肢に含まれていません。{}" -#: weko_search_ui/utils.py:3263 +#: weko_search_ui/utils.py:3290 msgid "Please specify Item URL for item link." msgstr "アイテムリンク先のURLを指定してください。" -#: weko_search_ui/utils.py:3277 +#: weko_search_ui/utils.py:3304 msgid "Specified Item Link URI and system URI do not match." msgstr "指定されたアイテムリンク先URIとシステムURIが一致しません。" -#: weko_search_ui/utils.py:3283 +#: weko_search_ui/utils.py:3310 msgid "Linking item does not exist in the system." msgstr "リンク先アイテムがシステムに存在しません。" -#: weko_search_ui/utils.py:3286 +#: weko_search_ui/utils.py:3313 msgid "Linking item already deleted in the system." msgstr "リンク先アイテムは削除済です。" -#: weko_search_ui/utils.py:3325 +#: weko_search_ui/utils.py:3352 msgid "It is not allowed to create links to the item itself." msgstr "自身へのアイテムリンクを作成することはできません。" -#: weko_search_ui/utils.py:3330 +#: weko_search_ui/utils.py:3357 msgid "It is not allowed to create links other than {} between split items." msgstr "分割したアイテム間で{}以外のリンクを作成することはできません。" -#: weko_search_ui/utils.py:3366 +#: weko_search_ui/utils.py:3393 msgid "Duplicate Item Link." msgstr "重複するアイテムリンクを作成することはできません。" -#: weko_search_ui/utils.py:3403 +#: weko_search_ui/utils.py:3430 msgid "'wk:metadataReplace' flag cannot be used when registering an item." msgstr "RO-Crate インポートでは、`wk:metadataReplace`フラグを有効にできません。" -#: weko_search_ui/utils.py:3720 +#: weko_search_ui/utils.py:3747 msgid "" "One of the following required values ​​has not been " "registered.
{}
" msgstr "次のいずれかの必要値が登録していません。
{}
" -#: weko_search_ui/utils.py:3725 +#: weko_search_ui/utils.py:3752 msgid "" "The mapping of required items for DOI validation is not set. Please " "recheck the following mapping settings.
{}" msgstr "" -#: weko_search_ui/utils.py:3735 +#: weko_search_ui/utils.py:3762 msgid "The following metadata are required.
{}" msgstr "{}は必須項目です。" -#: weko_search_ui/utils.py:3740 +#: weko_search_ui/utils.py:3767 msgid "One of the following metadata is required.
{}
" msgstr "{}のいずれかを設定してください。" -#: weko_search_ui/utils.py:3803 weko_search_ui/utils.py:3815 +#: weko_search_ui/utils.py:3830 weko_search_ui/utils.py:3842 msgid "Please specify the date with any format of YYYY-MM-DD, YYYY-MM, YYYY." msgstr "日付はYYYY-MM-DD、YYYY-MM、YYYYのいずれかで指定してください。" -#: weko_search_ui/utils.py:3809 +#: weko_search_ui/utils.py:3836 msgid "Replace value of {} from {} to {}." msgstr "{}の値を{}から{}へ置き換えました。" -#: weko_search_ui/utils.py:3832 +#: weko_search_ui/utils.py:3859 msgid "Please specify PubDate with YYYY-MM-DD." msgstr "公開日はYYYY-MM-DDで指定してください。" -#: weko_search_ui/utils.py:3862 +#: weko_search_ui/utils.py:3889 msgid "ID is specified for the newly registered item. Ignore the ID and register." msgstr "新規登録アイテムにIDが指定されています。IDを無視して登録を行います。" -#: weko_search_ui/utils.py:3945 +#: weko_search_ui/utils.py:3972 msgid "Please specify Open Access Date with YYYY-MM-DD." msgstr "オープンアクセスの日付はYYYY-MM-DDで指定してください。" -#: weko_search_ui/utils.py:4172 weko_search_ui/utils.py:4320 -#: weko_search_ui/utils.py:4326 +#: weko_search_ui/utils.py:4199 weko_search_ui/utils.py:4347 +#: weko_search_ui/utils.py:4353 msgid "Please specify DOI prefix/suffix." msgstr "DOIは prefix/suffix の形式で指定して下さい。" -#: weko_search_ui/utils.py:4312 +#: weko_search_ui/utils.py:4339 msgid "The specified DOI is wrong and fixed with the registered DOI." msgstr "" -#: weko_search_ui/utils.py:4315 +#: weko_search_ui/utils.py:4342 msgid "" "The specified DOI RA is wrong and fixed with the correct DOI RA of the " "registered DOI." msgstr "" -#: weko_search_ui/utils.py:4322 weko_search_ui/utils.py:4328 +#: weko_search_ui/utils.py:4349 weko_search_ui/utils.py:4355 msgid "Please specify DOI suffix." msgstr "" -#: weko_search_ui/utils.py:4331 +#: weko_search_ui/utils.py:4358 msgid "Do not specify DOI suffix." msgstr "" -#: weko_search_ui/utils.py:4337 +#: weko_search_ui/utils.py:4364 msgid "Specified Prefix of DOI is incorrect." msgstr "" -#: weko_search_ui/utils.py:4369 +#: weko_search_ui/utils.py:4396 msgid "" "Please specify the image file(gif, jpg, jpe, jpeg, png, bmp, tiff, tif) " "for the thumbnail." msgstr "サムネイルは画像ファイル（gif, jpg, jpe, jpeg, png, bmp, tiff, tif）を指定してください。" -#: weko_search_ui/utils.py:5490 +#: weko_search_ui/utils.py:5517 msgid "The file specified in ({}) does not exist." msgstr "（{}）に指定したファイルが存在しません。" -#: weko_search_ui/utils.py:5494 +#: weko_search_ui/utils.py:5521 msgid "" "The file specified in ({}) does not exist.
The file will not be " "updated. Update only the metadata with csv/tsv contents." msgstr "（{}）に指定したファイルが存在しません。
ファイルの更新はしません。csv/tsv内容でメタデータのみ更新します。" -#: weko_search_ui/utils.py:5781 +#: weko_search_ui/utils.py:5808 msgid "The file name specified in {} and {} do not match." msgstr "{}に指定されたファイル名と{}が一致しません。" @@ -1181,3 +1191,48 @@ msgstr "マッピング" msgid "Failed to get mapping list." msgstr "マッピング定義リストの取得に失敗しました。" +#~ msgid "Bagging a parent of the current directory is not supported" +#~ msgstr "" + +#~ msgid "Creating tag for directory %s" +#~ msgstr "" + +#~ msgid "Bag directory %s does not exist" +#~ msgstr "" + +#~ msgid "Bag directory %s does not contain a data directory" +#~ msgstr "" + +#~ msgid "" +#~ "Unable to write to the following directories and files:\n" +#~ "%s" +#~ msgstr "" + +#~ msgid "Missing permissions to move all files and directories" +#~ msgstr "" + +#~ msgid "" +#~ "The following directories do not have read permissions:\n" +#~ "%s" +#~ msgstr "" + +#~ msgid "" +#~ "The following files do not have read permissions:\n" +#~ "%s" +#~ msgstr "" + +#~ msgid "Read permissions are required to calculate file fixities" +#~ msgstr "" + +#~ msgid "Creating data directory" +#~ msgstr "" + +#~ msgid "Creating bagit.txt" +#~ msgstr "" + +#~ msgid "Creating bag-info.txt" +#~ msgstr "" + +#~ msgid "An error occurred creating a bag in %s" +#~ msgstr "" + diff --git a/modules/weko-search-ui/weko_search_ui/translations/messages.pot b/modules/weko-search-ui/weko_search_ui/translations/messages.pot index 0a30a6c702..66522c42fb 100644 --- a/modules/weko-search-ui/weko_search_ui/translations/messages.pot +++ b/modules/weko-search-ui/weko_search_ui/translations/messages.pot @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: weko-search-ui 0.1.0.dev20170000\n" "Report-Msgid-Bugs-To: wekosoftware@nii.ac.jp\n" -"POT-Creation-Date: 2025-11-11 20:49+0900\n" +"POT-Creation-Date: 2025-12-17 13:33+0900\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,69 +18,69 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 2.5.1\n" -#: tests/conftest.py:400 +#: tests/conftest.py:406 msgid "write your own license" msgstr "" -#: tests/conftest.py:405 +#: tests/conftest.py:411 msgid "Creative Commons CC0 1.0 Universal Public Domain Designation" msgstr "" -#: tests/conftest.py:421 +#: tests/conftest.py:427 msgid "Creative Commons Attribution 3.0 Unported (CC BY 3.0)" msgstr "" -#: tests/conftest.py:433 +#: tests/conftest.py:439 msgid "Creative Commons Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0)" msgstr "" -#: tests/conftest.py:448 +#: tests/conftest.py:454 msgid "Creative Commons Attribution-NoDerivs 3.0 Unported (CC BY-ND 3.0)" msgstr "" -#: tests/conftest.py:462 +#: tests/conftest.py:468 msgid "Creative Commons Attribution-NonCommercial 3.0 Unported (CC BY-NC 3.0)" msgstr "" -#: tests/conftest.py:477 +#: tests/conftest.py:483 msgid "" "Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported (CC " "BY-NC-SA 3.0)" msgstr "" -#: tests/conftest.py:492 +#: tests/conftest.py:498 msgid "" "Creative Commons Attribution-NonCommercial-NoDerivs 3.0 Unported (CC BY-" "NC-ND 3.0)" msgstr "" -#: tests/conftest.py:508 +#: tests/conftest.py:514 msgid "Creative Commons Attribution 4.0 International (CC BY 4.0)" msgstr "" -#: tests/conftest.py:520 +#: tests/conftest.py:526 msgid "Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)" msgstr "" -#: tests/conftest.py:535 +#: tests/conftest.py:541 msgid "" "Creative Commons Attribution-NoDerivatives 4.0 International (CC BY-ND " "4.0)" msgstr "" -#: tests/conftest.py:550 +#: tests/conftest.py:556 msgid "" "Creative Commons Attribution-NonCommercial 4.0 International (CC BY-NC " "4.0)" msgstr "" -#: tests/conftest.py:565 +#: tests/conftest.py:571 msgid "" "Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International " "(CC BY-NC-SA 4.0)" msgstr "" -#: tests/conftest.py:580 +#: tests/conftest.py:586 msgid "" "Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 " "International (CC BY-NC-ND 4.0)" @@ -214,42 +214,42 @@ msgstr "" msgid "Import Result" msgstr "" -#: weko_search_ui/mapper.py:1347 +#: weko_search_ui/mapper.py:1351 msgid "\"{key}\" is required." msgstr "" -#: weko_search_ui/mapper.py:1368 +#: weko_search_ui/mapper.py:1372 msgid "\"{key}\" is not in itemtype." msgstr "" -#: weko_search_ui/mapper.py:1370 +#: weko_search_ui/mapper.py:1374 msgid "\"{key}\" is not in itemtype, did you mean \"{similar_key}\"?" msgstr "" -#: weko_search_ui/mapper.py:1491 +#: weko_search_ui/mapper.py:1495 #, python-format msgid "" "Cannot map to item type from json-ld; Mapping is not defined for the " "metadata, \"%(key)s\": \"%(value)s\"" msgstr "" -#: weko_search_ui/mapper.py:1517 +#: weko_search_ui/mapper.py:1521 #, python-format msgid "" "Cannot map to item type from json-ld; Not found mapping destination for " "the metadata, \"%(key)s\": \"%(value)s\"" msgstr "" -#: weko_search_ui/mapper.py:1527 +#: weko_search_ui/mapper.py:1531 #, python-format msgid "Failed to set metadata for json-ld, \"%(key)s\": \"%(value)s\"" msgstr "" -#: weko_search_ui/mapper.py:1547 +#: weko_search_ui/mapper.py:1553 msgid "Metadata which could not be mapped to item type will be set in 'Extra'." msgstr "" -#: weko_search_ui/mapper.py:1551 +#: weko_search_ui/mapper.py:1557 msgid "Metadata which could not be mapped to item type will be discarded." msgstr "" @@ -347,259 +347,269 @@ msgid "" " the file is UTF-8 encoded." msgstr "" -#: weko_search_ui/utils.py:1454 +#: weko_search_ui/utils.py:1455 msgid "Please specify item ID by half-width number." msgstr "" -#: weko_search_ui/utils.py:1469 +#: weko_search_ui/utils.py:1477 +#, python-format +msgid "Replace value of %(target_path)s from %(old_value)s to '%(new_value)s'." +msgstr "" + +#: weko_search_ui/utils.py:1489 msgid "Specified item type does not exist." msgstr "" -#: weko_search_ui/utils.py:1540 +#: weko_search_ui/utils.py:1495 +#, python-format +msgid "Specified %(type)s is different from existing %(existing_type)s." +msgstr "" + +#: weko_search_ui/utils.py:1567 msgid "The same item may have been registered." msgstr "" -#: weko_search_ui/utils.py:1570 +#: weko_search_ui/utils.py:1597 msgid "Specified URI and system URI do not match." msgstr "" -#: weko_search_ui/utils.py:1582 +#: weko_search_ui/utils.py:1609 msgid "Item does not exist in the system." msgstr "" -#: weko_search_ui/utils.py:1589 +#: weko_search_ui/utils.py:1616 msgid "Item already DELETED in the system." msgstr "" -#: weko_search_ui/utils.py:1606 +#: weko_search_ui/utils.py:1633 msgid "Please specify either \"Keep\" or \"Upgrade\"." msgstr "" -#: weko_search_ui/utils.py:2565 +#: weko_search_ui/utils.py:2592 msgid "Title is required item." msgstr "" -#: weko_search_ui/utils.py:2582 +#: weko_search_ui/utils.py:2609 msgid "{} is required item." msgstr "" -#: weko_search_ui/utils.py:2585 +#: weko_search_ui/utils.py:2612 msgid "Please set \"public\" or \"private\" for {}." msgstr "" -#: weko_search_ui/utils.py:2626 +#: weko_search_ui/utils.py:2653 msgid "The specified {} does not exist in system." msgstr "" -#: weko_search_ui/utils.py:2636 +#: weko_search_ui/utils.py:2663 msgid "Specified {} does not match with existing index." msgstr "" -#: weko_search_ui/utils.py:2680 +#: weko_search_ui/utils.py:2707 msgid "Your role cannot register items in this index." msgstr "" -#: weko_search_ui/utils.py:2701 +#: weko_search_ui/utils.py:2728 msgid "Both of IndexID and POS_INDEX are not being set." msgstr "" -#: weko_search_ui/utils.py:2747 weko_search_ui/utils.py:2772 +#: weko_search_ui/utils.py:2774 weko_search_ui/utils.py:2799 msgid "Specified {} is invalid." msgstr "" -#: weko_search_ui/utils.py:2806 +#: weko_search_ui/utils.py:2833 msgid "If there is a info of content file, terms of use cannot be set." msgstr "" -#: weko_search_ui/utils.py:2813 weko_search_ui/utils.py:6063 +#: weko_search_ui/utils.py:2840 weko_search_ui/utils.py:6090 msgid "The specified provinding method does not exist in the system" msgstr "" -#: weko_search_ui/utils.py:2818 weko_search_ui/utils.py:6058 +#: weko_search_ui/utils.py:2845 weko_search_ui/utils.py:6085 msgid "The specified terms does not exist in the system" msgstr "" -#: weko_search_ui/utils.py:2910 weko_search_ui/utils.py:2943 -#: weko_search_ui/utils.py:3035 weko_search_ui/utils.py:3147 -#: weko_search_ui/utils.py:3169 weko_search_ui/utils.py:3204 +#: weko_search_ui/utils.py:2937 weko_search_ui/utils.py:2970 +#: weko_search_ui/utils.py:3062 weko_search_ui/utils.py:3174 +#: weko_search_ui/utils.py:3196 weko_search_ui/utils.py:3231 msgid "Please specify {}." msgstr "" -#: weko_search_ui/utils.py:2913 weko_search_ui/utils.py:3150 +#: weko_search_ui/utils.py:2940 weko_search_ui/utils.py:3177 msgid "The specified {} exceeds the maximum length." msgstr "" -#: weko_search_ui/utils.py:2928 weko_search_ui/utils.py:3085 -#: weko_search_ui/utils.py:3096 weko_search_ui/utils.py:3165 +#: weko_search_ui/utils.py:2955 weko_search_ui/utils.py:3112 +#: weko_search_ui/utils.py:3123 weko_search_ui/utils.py:3192 msgid "Specified Prefix of {} is incorrect." msgstr "" -#: weko_search_ui/utils.py:2936 weko_search_ui/utils.py:3079 -#: weko_search_ui/utils.py:3089 +#: weko_search_ui/utils.py:2963 weko_search_ui/utils.py:3106 +#: weko_search_ui/utils.py:3116 msgid "{} cannot be set." msgstr "" -#: weko_search_ui/utils.py:2945 weko_search_ui/utils.py:2949 -#: weko_search_ui/utils.py:3018 weko_search_ui/utils.py:3206 +#: weko_search_ui/utils.py:2972 weko_search_ui/utils.py:2976 +#: weko_search_ui/utils.py:3045 weko_search_ui/utils.py:3233 msgid "Specified {} is different from existing {}." msgstr "" -#: weko_search_ui/utils.py:2969 +#: weko_search_ui/utils.py:2996 msgid "" "When assigning a DOI to an item, it must be associated with an index " "whose index status is \"Public\" and Harvest Publishing is \"Public\"." msgstr "" -#: weko_search_ui/utils.py:2974 +#: weko_search_ui/utils.py:3001 msgid "" "Since the item has a DOI, it must be associated with an index whose index" " status is \"Public\" and whose Harvest Publishing is \"Public\"." msgstr "" -#: weko_search_ui/utils.py:2985 +#: weko_search_ui/utils.py:3012 msgid "You cannot keep an item private because it has a DOI." msgstr "" -#: weko_search_ui/utils.py:3039 weko_search_ui/utils.py:4335 +#: weko_search_ui/utils.py:3066 weko_search_ui/utils.py:4362 msgid "DOI_RA should be set by one of JaLC, Crossref, DataCite, NDL JaLC." msgstr "" -#: weko_search_ui/utils.py:3122 +#: weko_search_ui/utils.py:3149 msgid "Specified DOI was withdrawn. Please specify another DOI." msgstr "" -#: weko_search_ui/utils.py:3130 +#: weko_search_ui/utils.py:3157 msgid "" "Specified DOI has been used already for another item. Please specify " "another DOI." msgstr "" -#: weko_search_ui/utils.py:3226 +#: weko_search_ui/utils.py:3253 msgid "" "Specified DOI is duplicated with another import item. Please specify " "another DOI." msgstr "" -#: weko_search_ui/utils.py:3259 +#: weko_search_ui/utils.py:3286 msgid "Item Link type: '{}' is not one of {}." msgstr "" -#: weko_search_ui/utils.py:3263 +#: weko_search_ui/utils.py:3290 msgid "Please specify Item URL for item link." msgstr "" -#: weko_search_ui/utils.py:3277 +#: weko_search_ui/utils.py:3304 msgid "Specified Item Link URI and system URI do not match." msgstr "" -#: weko_search_ui/utils.py:3283 +#: weko_search_ui/utils.py:3310 msgid "Linking item does not exist in the system." msgstr "" -#: weko_search_ui/utils.py:3286 +#: weko_search_ui/utils.py:3313 msgid "Linking item already deleted in the system." msgstr "" -#: weko_search_ui/utils.py:3325 +#: weko_search_ui/utils.py:3352 msgid "It is not allowed to create links to the item itself." msgstr "" -#: weko_search_ui/utils.py:3330 +#: weko_search_ui/utils.py:3357 msgid "It is not allowed to create links other than {} between split items." msgstr "" -#: weko_search_ui/utils.py:3366 +#: weko_search_ui/utils.py:3393 msgid "Duplicate Item Link." msgstr "" -#: weko_search_ui/utils.py:3403 +#: weko_search_ui/utils.py:3430 msgid "'wk:metadataReplace' flag cannot be used when registering an item." msgstr "" -#: weko_search_ui/utils.py:3720 +#: weko_search_ui/utils.py:3747 msgid "" "One of the following required values ​​has not been " "registered.
{}
" msgstr "" -#: weko_search_ui/utils.py:3725 +#: weko_search_ui/utils.py:3752 msgid "" "The mapping of required items for DOI validation is not set. Please " "recheck the following mapping settings.
{}" msgstr "" -#: weko_search_ui/utils.py:3735 +#: weko_search_ui/utils.py:3762 msgid "The following metadata are required.
{}" msgstr "" -#: weko_search_ui/utils.py:3740 +#: weko_search_ui/utils.py:3767 msgid "One of the following metadata is required.
{}
" msgstr "" -#: weko_search_ui/utils.py:3803 weko_search_ui/utils.py:3815 +#: weko_search_ui/utils.py:3830 weko_search_ui/utils.py:3842 msgid "Please specify the date with any format of YYYY-MM-DD, YYYY-MM, YYYY." msgstr "" -#: weko_search_ui/utils.py:3809 +#: weko_search_ui/utils.py:3836 msgid "Replace value of {} from {} to {}." msgstr "" -#: weko_search_ui/utils.py:3832 +#: weko_search_ui/utils.py:3859 msgid "Please specify PubDate with YYYY-MM-DD." msgstr "" -#: weko_search_ui/utils.py:3862 +#: weko_search_ui/utils.py:3889 msgid "ID is specified for the newly registered item. Ignore the ID and register." msgstr "" -#: weko_search_ui/utils.py:3945 +#: weko_search_ui/utils.py:3972 msgid "Please specify Open Access Date with YYYY-MM-DD." msgstr "" -#: weko_search_ui/utils.py:4172 weko_search_ui/utils.py:4320 -#: weko_search_ui/utils.py:4326 +#: weko_search_ui/utils.py:4199 weko_search_ui/utils.py:4347 +#: weko_search_ui/utils.py:4353 msgid "Please specify DOI prefix/suffix." msgstr "" -#: weko_search_ui/utils.py:4312 +#: weko_search_ui/utils.py:4339 msgid "The specified DOI is wrong and fixed with the registered DOI." msgstr "" -#: weko_search_ui/utils.py:4315 +#: weko_search_ui/utils.py:4342 msgid "" "The specified DOI RA is wrong and fixed with the correct DOI RA of the " "registered DOI." msgstr "" -#: weko_search_ui/utils.py:4322 weko_search_ui/utils.py:4328 +#: weko_search_ui/utils.py:4349 weko_search_ui/utils.py:4355 msgid "Please specify DOI suffix." msgstr "" -#: weko_search_ui/utils.py:4331 +#: weko_search_ui/utils.py:4358 msgid "Do not specify DOI suffix." msgstr "" -#: weko_search_ui/utils.py:4337 +#: weko_search_ui/utils.py:4364 msgid "Specified Prefix of DOI is incorrect." msgstr "" -#: weko_search_ui/utils.py:4369 +#: weko_search_ui/utils.py:4396 msgid "" "Please specify the image file(gif, jpg, jpe, jpeg, png, bmp, tiff, tif) " "for the thumbnail." msgstr "" -#: weko_search_ui/utils.py:5490 +#: weko_search_ui/utils.py:5517 msgid "The file specified in ({}) does not exist." msgstr "" -#: weko_search_ui/utils.py:5494 +#: weko_search_ui/utils.py:5521 msgid "" "The file specified in ({}) does not exist.
The file will not be " "updated. Update only the metadata with csv/tsv contents." msgstr "" -#: weko_search_ui/utils.py:5781 +#: weko_search_ui/utils.py:5808 msgid "The file name specified in {} and {} do not match." msgstr "" diff --git a/modules/weko-search-ui/weko_search_ui/utils.py b/modules/weko-search-ui/weko_search_ui/utils.py index 7782a5e6d5..6e021b6da9 100644 --- a/modules/weko-search-ui/weko_search_ui/utils.py +++ b/modules/weko-search-ui/weko_search_ui/utils.py @@ -73,7 +73,7 @@ from sqlalchemy import func as _func from sqlalchemy.exc import SQLAlchemyError -from weko_admin.models import AdminSettings, SessionLifetime +from weko_admin.models import AdminSettings, SessionLifetime, FacetSearchSetting from weko_admin.utils import get_redis_cache, reset_redis_cache, get_restricted_access from weko_admin.api import TempDirInfo from weko_authors.models import AuthorsAffiliationSettings, AuthorsPrefixSettings @@ -574,7 +574,7 @@ def check_tsv_import_items( list_record = handle_check_exist_record(list_record) handle_item_title(list_record) - + list_record = handle_check_date(list_record) handle_check_id(list_record) @@ -594,7 +594,7 @@ def check_tsv_import_items( handle_check_authors_prefix(list_record) handle_check_authors_affiliation(list_record) - + if not is_gakuninrdm: handle_check_cnri(list_record) handle_check_doi_indexes(list_record) @@ -768,7 +768,7 @@ def unpackage_import_file(data_path: str, file_name: str, file_format: str, forc record["uri"] = None current_app.logger.debug('list_record2: {}'.format(list_record)) - + handle_set_change_identifier_flag(list_record, is_change_identifier) handle_fill_system_item(list_record) @@ -930,7 +930,8 @@ def check_jsonld_import_items( with open(f"{data_path}/{json_name}", "r") as f: json_ld = json.load(f) - item_metadatas, _fromat = mapper.to_item_metadata(json_ld) + mapper.data_path = data_path + item_metadatas, _ = mapper.to_item_metadata(json_ld) list_record = [ { "$schema": f"/items/jsonschema/{item_type.id}", @@ -1262,7 +1263,7 @@ def read_stats_file(file_path: str, file_name: str, file_format: str) -> dict: current_app.logger.debug( "duplication_item_ids: {}".format(duplication_item_ids) ) - + if duplication_item_ids: msg = _("The following metadata keys are duplicated." "
{}") raise Exception( @@ -1283,7 +1284,7 @@ def read_stats_file(file_path: str, file_name: str, file_format: str) -> dict: current_app.logger.debug( "not_consistent_list: {}".format(not_consistent_list) ) - + if not_consistent_list: msg = _( "The item does not consistent with the " @@ -1302,7 +1303,7 @@ def read_stats_file(file_path: str, file_name: str, file_format: str) -> dict: current_app.logger.debug( "item_path_not_existed: {}".format(item_path_not_existed) ) - + elif (num == 4 or num == 5) and data_row[0].startswith("#"): continue @@ -1310,7 +1311,7 @@ def read_stats_file(file_path: str, file_name: str, file_format: str) -> dict: data_parse_metadata = parse_to_json_form( zip(item_path, data_row), item_path_not_existed ) - + if not data_parse_metadata: raise Exception( {"error_msg": _("Cannot read {} file correctly.".format(file_format.upper()))} @@ -1446,6 +1447,7 @@ def handle_validate_item_import(list_record, schema) -> list: v2 = Draft4Validator(schema) if schema else None for record in list_record: errors = record.get("errors") or [] + warnings = [] record_id = record.get("id") if record_id and ( not represents_int(record_id) or re.search(r"([０-９])", record_id) @@ -1457,19 +1459,45 @@ def handle_validate_item_import(list_record, schema) -> list: if record.get("metadata"): if v2: a = v2.iter_errors(record.get("metadata")) + for error in a: + if ( + error.validator == "type" + and error.validator_value == "string" + and isinstance(error.instance, int) + ): + target = record["metadata"] + path_list = list(error.path) + for key in path_list[:-1]: + target = target[key] + last_key = path_list[-1] + target[last_key] = str(target[last_key]) + target_path = ".".join([str(p) for p in path_list[:-2]]) + warnings.append( + _("Replace value of %(target_path)s from %(old_value)s to '%(new_value)s'.", + target_path=target_path, old_value=target[last_key], new_value=str(target[last_key]) + ) + ) + b = v2.iter_errors(record.get("metadata")) if current_i18n.language == "ja": _errors = [] - for error in a: + for error in b: _errors.append(handle_convert_validate_msg_to_jp(error.message)) errors = errors + _errors else: - errors = errors + [error.message for error in a] + errors = errors + [error.message for error in b] else: errors = errors = errors + [_("Specified item type does not exist.")] - item_error = dict(**record) - item_error["errors"] = errors if len(errors) else None - result.append(item_error) + records = dict(**record) + records["errors"] = errors if len(errors) else None + if len(warnings) > 0: + warnings.append( + _("Specified %(type)s is different from existing %(existing_type)s.", + type="type:integer", existing_type="type:string" + ) + ) + records["warnings"] = warnings if len(warnings) else None + result.append(records) return result @@ -6121,3 +6149,59 @@ def check_provide_in_system(key, item): is_provide_exist[idx] = False break return all(is_provide_exist) + +def fix_aggregations_accessrights(data): + """ + Refactor accessrights aggregation in search result for compliance. + Args: + data (dict): Aggregation result from search response. + Returns: + dict: Modified aggregation result. + """ + ACCESSRIGHTS_FIX_ENABLED = current_app.config.get( + "WEKO_SEARCH_FIX_ACCESSRIGHTS", False + ) + ACCESS_RIGHTS_CHOICES = current_app.config.get( + "WEKO_ACCESS_RIGHTS_CHOICES", + [ + "embargoed access", + "metadata only access", + "open access", + "restricted access", + ] + ) + aggs = data['aggregations'] + if not ACCESSRIGHTS_FIX_ENABLED: + return data + + # Get mapping for accessRights facets + mapping = FacetSearchSetting.get_activated_facets_mapping() + accessrights_keys = [ + k for k, v in mapping.items() if v == "accessRights" + ] + if "new_accessRights" not in aggs or not accessrights_keys: + return data + + new_accessrights = aggs["new_accessRights"] + buckets_dict = new_accessrights.get("buckets", {}) + if not any( + right in buckets_dict for right in ACCESS_RIGHTS_CHOICES + ): + return data + + buckets = [] + for right in ACCESS_RIGHTS_CHOICES: + value = buckets_dict.get(right) + if not value: + continue + doc_count = value.get("doc_count", 0) + if doc_count == 0: + continue + buckets.append({"key": right, "doc_count": doc_count}) + if buckets: + for key in accessrights_keys: + if key in aggs: + aggs[key]["buckets"] = buckets + aggs.pop("new_accessRights", None) + data['aggregations'] = aggs + return data diff --git a/modules/weko-swordserver/weko_swordserver/utils.py b/modules/weko-swordserver/weko_swordserver/utils.py index eded609e20..7bb2346672 100644 --- a/modules/weko-swordserver/weko_swordserver/utils.py +++ b/modules/weko-swordserver/weko_swordserver/utils.py @@ -570,4 +570,3 @@ def notify_about_item(case, recid, user_id, record=None, shared_ids=[]): user_id, recid, user_id, record["item_title"], shared_ids ) send_mail_item_deleted(recid, record, user_id, shared_ids) - \ No newline at end of file diff --git a/nginx/Dockerfile.ams b/nginx/Dockerfile.ams index 7e7e78e016..c514df78e1 100644 --- a/nginx/Dockerfile.ams +++ b/nginx/Dockerfile.ams @@ -37,7 +37,8 @@ RUN cd nginx-1.20.1 && dpkg-buildpackage -b FROM ubuntu:focal AS nginx-stage_1 ENV DEBIAN_FRONTEND=noninteractive -RUN apt-get update && apt-get install -y openssl wget curl unzip supervisor shibboleth-sp-common shibboleth-sp-utils php-fpm php-curl +RUN apt-get update && apt-get install -y openssl wget curl unzip supervisor shibboleth-sp-common shibboleth-sp-utils php-fpm php-curl fcgiwrap python3-pip +RUN pip3 install requests WORKDIR /tmp #COPY --from=nginx-with-shib /tmp/nginx_1.18.0-2~focal_amd64.deb . @@ -76,7 +77,8 @@ RUN chmod 400 /etc/nginx/server.key RUN mkdir /usr/share/nginx/html/secure #ADD ./phpinfo.php /usr/share/nginx/html/secure/phpinfo.php #ADD ./index.php /usr/share/nginx/html/secure/index.php -ADD ./login.php /usr/share/nginx/html/secure/login.php +ADD ./login.py /usr/share/nginx/html/secure/login.py +RUN chmod 755 /usr/share/nginx/html/secure/login.py ADD ./shib_clear_headers /etc/nginx/shib_clear_headers ADD ./shib_fastcgi_params /etc/nginx/shib_fastcgi_params @@ -97,4 +99,3 @@ RUN chmod +x /usr/local/startup.sh RUN chmod +x /usr/local/ecosystem.config.js CMD ["/usr/local/startup.sh"] - diff --git a/nginx/ams/weko-frontend/app.config.ts b/nginx/ams/weko-frontend/app.config.ts index e9b36479b3..e38ac33a0b 100644 --- a/nginx/ams/weko-frontend/app.config.ts +++ b/nginx/ams/weko-frontend/app.config.ts @@ -3,6 +3,9 @@ const weko = 'ams-dev.ir.rcos.nii.ac.jp'; export default defineAppConfig({ wekoOrigin: 'https://' + weko, wekoApi: 'https://' + weko + '/api/v1', + amsImage: '/img/ams', + amsPath: '/ams', + amsApi: '/api/ams', export: { jpcoar: 'https://' + weko + '/oai?verb=GetRecord&metadataPrefix=jpcoar_1.0&identifier=oai:ams-dev.ir.rcos.nii.ac.jp:', @@ -24,27 +27,24 @@ export default defineAppConfig({ releaseRange: 'accessMode', // 公開日 releaseDate: 'dateCreated', - // 作成日 + // メタデータ作成日 createDate: 'dateCreated', - // 更新日 + // メタデータ更新日 updateDate: 'reviews', - // タイトル + // データセットの名称 title: 'subjectOf', - // 分野 + // データセットの分野 field: 'genre', - // 作成者氏名 + // データ作成者氏名 authorName: 'creator', - // 作成者所属 + // データ作成者所属 authorAffiliation: 'creativeWorkStatus', - // ヒト/動物/その他 + // 取得データの対象種別 target: 'character', // アクセス権 accessMode: 'accessMode', // キーワード keywords: 'keywords', - // プロジェクトID - // TODO: valueはマッピング整理後に修正予定 - projectId: 'text', // ファイル情報 file: { // 格納場所 @@ -97,6 +97,10 @@ export default defineAppConfig({ } } }, + grdm: { + url: '', + relationType: 'isVersionOf' + }, /** CC license setting */ cc: { /** @@ -147,5 +151,23 @@ export default defineAppConfig({ by_nc_nd_4: 'https://creativecommons.org/licenses/by-nc-nd/4.0/', by_nc_nd_4_ja: 'https://creativecommons.org/licenses/by-nc-nd/4.0/deed.ja' } + }, + /** + * 閲覧権限が必要なアイテム詳細画面からログイン画面へ遷移するまでの時間設定 + */ + transitionTimeMs: 10000, // ミリ秒 + /** + * フロントのShibboleth Login設定 + */ + shibLogin: { + // 本番環境 + dsURL: 'https://ds.gakunin.nii.ac.jp/WAYF', + orthrosURL: 'https://core.orthros.gakunin.nii.ac.jp/idp', + // テスト環境 + // dsURL: 'https://test-ds.gakunin.nii.ac.jp/WAYF', + // orthrosURL: 'https://core-stg.orthros.gakunin.nii.ac.jp/idp', + entityID: 'https://' + weko + '/shibboleth', + handlerURL: 'https://' + weko + '/Shibboleth.sso', + returnURL: 'https://' + weko + '/secure/login.py?next=ams' } }); diff --git a/nginx/ams/weko-frontend/assets/data/amsAlert.json b/nginx/ams/weko-frontend/assets/data/amsAlert.json new file mode 100644 index 0000000000..93ba069761 --- /dev/null +++ b/nginx/ams/weko-frontend/assets/data/amsAlert.json @@ -0,0 +1,556 @@ +{ + "INDEX_MESSAGE_ERROR_AUTH": { + "msgid": "INDEX_E_0001", + "msgstr": "message.error.auth", + "position": "", + "width": "w-full", + "loglevel": "error" + }, + "INDEX_MESSAGE_ERROR_SERVER": { + "msgid": "INDEX_E_0002", + "msgstr": "message.error.server", + "position": "", + "width": "w-full", + "loglevel": "error" + }, + "INDEX_MESSAGE_ERROR_GET_LATEST_ITEM": { + "msgid": "INDEX_E_0003", + "msgstr": "message.error.getLatestItem", + "position": "", + "width": "w-full", + "loglevel": "error" + }, + "INDEX_MESSAGE_ERROR_FETCH": { + "msgid": "INDEX_E_0004", + "msgstr": "message.error.fetch", + "position": "", + "width": "w-full", + "loglevel": "error" + }, + "INDEX_MESSAGE_ERROR": { + "msgid": "INDEX_E_0005", + "msgstr": "message.error.error", + "position": "", + "width": "w-full", + "loglevel": "error" + }, + "CONTACT_MESSAGE_SENDING_FAILED": { + "msgid": "CONTACT_E_0001", + "msgstr": "message.sendingFailed", + "position": "toast-top pt-20", + "width": "w-auto", + "loglevel": "error" + }, + "DETAIL_ITEM_MESSAGE_ERROR_AUTH": { + "msgid": "DETAIL_E_0001", + "msgstr": "message.error.noItemAuth", + "position": "", + "width": "w-full", + "loglevel": "error" + }, + "DETAIL_ITEM_MESSAGE_OAUTH_ERROR": { + "msgid": "DETAIL_E_0002", + "msgstr": "message.error.oauthError", + "position": "", + "width": "w-full", + "loglevel": "error" + }, + "DETAIL_ITEM_MESSAGE_ERROR_SERVER": { + "msgid": "DETAIL_E_0003", + "msgstr": "message.error.server", + "position": "", + "width": "w-full", + "loglevel": "error" + }, + "DETAIL_ITEM_MESSAGE_ERROR_GET_ITEM_DETAIL": { + "msgid": "DETAIL_E_0004", + "msgstr": "message.error.getItemDetail", + "position": "", + "width": "w-full", + "loglevel": "error" + }, + "DETAIL_ITEM_MESSAGE_ERROR_FETCH": { + "msgid": "DETAIL_E_0005", + "msgstr": "message.error.fetch", + "position": "", + "width": "w-full", + "loglevel": "error" + }, + "DETAIL_SEARCH_MESSAGE_ERROR_AUTH": { + "msgid": "DETAIL_E_0006", + "msgstr": "message.error.auth", + "position": "", + "width": "w-full", + "loglevel": "error" + }, + "DETAIL_SEARCH_MESSAGE_OAUTH_ERROR": { + "msgid": "DETAIL_E_0007", + "msgstr": "message.error.oauthError", + "position": "", + "width": "w-full", + "loglevel": "error" + }, + "DETAIL_SEARCH_MESSAGE_ERROR_SERVER": { + "msgid": "DETAIL_E_0008", + "msgstr": "message.error.server", + "position": "", + "width": "w-full", + "loglevel": "error" + }, + "DETAIL_SEARCH_MESSAGE_ERROR_GET_INDEX": { + "msgid": "DETAIL_E_0009", + "msgstr": "message.error.getIndex", + "position": "", + "width": "w-full", + "loglevel": "error" + }, + "DETAIL_SEARCH_MESSAGE_ERROR_FETCH": { + "msgid": "DETAIL_E_0010", + "msgstr": "message.error.fetch", + "position": "", + "width": "w-full", + "loglevel": "error" + }, + "DETAIL_INDEX_MESSAGE_ERROR_AUTH": { + "msgid": "DETAIL_E_0011", + "msgstr": "message.error.auth", + "position": "", + "width": "w-full", + "loglevel": "error" + }, + "DETAIL_INDEX_MESSAGE_OAUTH_ERROR": { + "msgid": "DETAIL_E_0012", + "msgstr": "message.error.oauthError", + "position": "", + "width": "w-full", + "loglevel": "error" + }, + "DETAIL_INDEX_MESSAGE_ERROR_SERVER": { + "msgid": "DETAIL_E_0013", + "msgstr": "message.error.server", + "position": "", + "width": "w-full", + "loglevel": "error" + }, + "DETAIL_INDEX_MESSAGE_ERROR_GET_INDEX": { + "msgid": "DETAIL_E_0014", + "msgstr": "message.error.getIndex", + "position": "", + "width": "w-full", + "loglevel": "error" + }, + "DETAIL_INDEX_MESSAGE_ERROR_FETCH": { + "msgid": "DETAIL_E_0015", + "msgstr": "message.error.fetch", + "position": "", + "width": "w-full", + "loglevel": "error" + }, + "DETAIL_MESSAGE_SENDING_FAILED": { + "msgid": "DETAIL_E_0016", + "msgstr": "message.sendingFailed", + "position": "toast-top pt-20", + "width": "w-auto", + "loglevel": "error" + }, + "DETAIL_MESSAGE_ERROR": { + "msgid": "DETAIL_E_0017", + "msgstr": "message.error.error", + "position": "", + "width": "w-full", + "loglevel": "error" + }, + "FILES_DETAIL_MESSAGE_ERROR_AUTH": { + "msgid": "FILES_E_0001", + "msgstr": "message.error.auth", + "position": "", + "width": "w-full", + "loglevel": "error" + }, + "FILES_DETAIL_MESSAGE_ERROR_SERVER": { + "msgid": "FILES_E_0002", + "msgstr": "message.error.server", + "position": "", + "width": "w-full", + "loglevel": "error" + }, + "FILES_DETAIL_MESSAGE_ERROR_GET_ITEM_DETAIL": { + "msgid": "FILES_E_0003", + "msgstr": "message.error.getItemDetail", + "position": "", + "width": "w-full", + "loglevel": "error" + }, + "FILES_DETAIL_MESSAGE_ERROR_FETCH": { + "msgid": "FILES_E_0004", + "msgstr": "message.error.fetch", + "position": "", + "width": "w-full", + "loglevel": "error" + }, + "FILES_ALL_MESSAGE_ERROR_AUTH": { + "msgid": "FILES_E_0005", + "msgstr": "message.error.auth", + "position": "", + "width": "w-full", + "loglevel": "error" + }, + "FILES_ALL_MESSAGE_ERROR_SERVER": { + "msgid": "FILES_E_0006", + "msgstr": "message.error.server", + "position": "", + "width": "w-full", + "loglevel": "error" + }, + "FILES_ALL_MESSAGE_ERROR_DOWNLOAD_ALL": { + "msgid": "FILES_E_0007", + "msgstr": "message.error.downloadAll", + "position": "", + "width": "w-full", + "loglevel": "error" + }, + "FILES_ALL_MESSAGE_ERROR_FETCH": { + "msgid": "FILES_E_0008", + "msgstr": "message.error.fetch", + "position": "", + "width": "w-full", + "loglevel": "error" + }, + "FILES_SELECT_MESSAGE_ERROR_AUTH": { + "msgid": "FILES_E_0009", + "msgstr": "message.error.auth", + "position": "", + "width": "w-full", + "loglevel": "error" + }, + "FILES_SELECT_MESSAGE_ERROR_SERVER": { + "msgid": "FILES_E_0010", + "msgstr": "message.error.server", + "position": "", + "width": "w-full", + "loglevel": "error" + }, + "FILES_SELECT_MESSAGE_ERROR_DOWNLOAD_SELECTED": { + "msgid": "FILES_E_0011", + "msgstr": "message.error.downloadSelected", + "position": "", + "width": "w-full", + "loglevel": "error" + }, + "FILES_SELECT_MESSAGE_ERROR_FETCH": { + "msgid": "FILES_E_0012", + "msgstr": "message.error.fetch", + "position": "", + "width": "w-full", + "loglevel": "error" + }, + "FILES_MESSAGE_ERROR": { + "msgid": "FILES_E_0013", + "msgstr": "message.error.error", + "position": "", + "width": "w-full", + "loglevel": "error" + }, + "LOGIN_MESSAGE_ERROR_SERVER": { + "msgid": "LOGIN_E_0001", + "msgstr": "message.error.server", + "position": "", + "width": "w-full", + "loglevel": "error" + }, + "LOGIN_MESSAGE_ERROR_REQUEST": { + "msgid": "LOGIN_E_0002", + "msgstr": "message.error.login", + "position": "", + "width": "w-full", + "loglevel": "error" + }, + "LOGIN_MESSAGE_ERROR_FETCH": { + "msgid": "LOGIN_E_0003", + "msgstr": "message.error.fetch", + "position": "", + "width": "w-full", + "loglevel": "error" + }, + "LOGIN_MESSAGE_ERROR_LOGIN_BLOCK": { + "msgid": "LOGIN_E_0004", + "msgstr": "message.error.loginFailed", + "position": "", + "width": "w-full", + "loglevel": "error" + }, + "LOGIN_MESSAGE_ERROR_NO_USER_INFORMATION": { + "msgid": "LOGIN_E_0005", + "msgstr": "message.error.noUserInformation", + "position": "", + "width": "w-full", + "loglevel": "error" + }, + "LOGIN_SHIB_MESSAGE_ERROR_SERVER": { + "msgid": "LOGIN_E_0006", + "msgstr": "message.error.server", + "position": "", + "width": "w-full", + "loglevel": "error" + }, + "LOGIN_MESSAGE_ERROR_SHIB_CACHE_PREFIX": { + "msgid": "LOGIN_E_0007", + "msgstr": "message.error.loginFailed", + "position": "", + "width": "w-full", + "loglevel": "error" + }, + "LOGIN_MESSAGE_ERROR_SHIB_SESSION_ID": { + "msgid": "LOGIN_E_0008", + "msgstr": "message.error.loginFailed", + "position": "", + "width": "w-full", + "loglevel": "error" + }, + "LOGIN_MESSAGE_ERROR_SHIB_ATTRS": { + "msgid": "LOGIN_E_0009", + "msgstr": "message.error.loginFailed", + "position": "", + "width": "w-full", + "loglevel": "error" + }, + "LOGIN_MESSAGE_ERROR_BIND_RELATION_INFO": { + "msgid": "LOGIN_E_0010", + "msgstr": "message.error.loginFailed", + "position": "", + "width": "w-full", + "loglevel": "error" + }, + "LOGIN_MESSAGE_ERROR_FAILED_GET_RELATION": { + "msgid": "LOGIN_E_0011", + "msgstr": "message.error.loginFailed", + "position": "", + "width": "w-full", + "loglevel": "error" + }, + "LOGIN_SHIB_MESSAGE_ERROR_LOGIN_FAILED": { + "msgid": "LOGIN_E_0012", + "msgstr": "message.error.loginFailed", + "position": "", + "width": "w-full", + "loglevel": "error" + }, + "ID_SEARCH_MESSAGE_ERROR_AUTH": { + "msgid": "ID_E_0001", + "msgstr": "message.error.auth", + "position": "", + "width": "w-full", + "loglevel": "error" + }, + "ID_SEARCH_MESSAGE_ERROR_SERVER": { + "msgid": "ID_E_0002", + "msgstr": "message.error.server", + "position": "", + "width": "w-full", + "loglevel": "error" + }, + "ID_SEARCH_MESSAGE_ERROR_REQUEST": { + "msgid": "ID_E_0003", + "msgstr": "message.error.search", + "position": "", + "width": "w-full", + "loglevel": "error" + }, + "ID_SEARCH_MESSAGE_ERROR_FETCH": { + "msgid": "ID_E_0004", + "msgstr": "message.error.fetch", + "position": "", + "width": "w-full", + "loglevel": "error" + }, + "ID_INDEX_MESSAGE_ERROR_AUTH": { + "msgid": "ID_E_0005", + "msgstr": "message.error.auth", + "position": "", + "width": "w-full", + "loglevel": "error" + }, + "ID_INDEX_MESSAGE_ERROR_SERVER": { + "msgid": "ID_E_0006", + "msgstr": "message.error.server", + "position": "", + "width": "w-full", + "loglevel": "error" + }, + "ID_INDEX_MESSAGE_ERROR_GET_INDEX": { + "msgid": "ID_E_0007", + "msgstr": "message.error.getIndex", + "position": "", + "width": "w-full", + "loglevel": "error" + }, + "ID_INDEX_MESSAGE_ERROR_FETCH": { + "msgid": "ID_E_0008", + "msgstr": "message.error.fetch", + "position": "", + "width": "w-full", + "loglevel": "error" + }, + "ID_DOWNLOAD_MESSAGE_ERROR_AUTH": { + "msgid": "ID_E_0009", + "msgstr": "message.error.auth", + "position": "", + "width": "w-full", + "loglevel": "error" + }, + "ID_DOWNLOAD_MESSAGE_ERROR_SERVER": { + "msgid": "ID_E_0010", + "msgstr": "message.error.server", + "position": "", + "width": "w-full", + "loglevel": "error" + }, + "ID_DOWNLOAD_MESSAGE_ERROR_DOWNLOAD_RESULT": { + "msgid": "ID_E_0011", + "msgstr": "message.error.downloadResult", + "position": "", + "width": "w-full", + "loglevel": "error" + }, + "ID_DOWNLOAD_MESSAGE_ERROR_FETCH": { + "msgid": "ID_E_0012", + "msgstr": "message.error.fetch", + "position": "", + "width": "w-full", + "loglevel": "error" + }, + "ID_MESSAGE_ERROR": { + "msgid": "ID_E_0013", + "msgstr": "message.error.error", + "position": "", + "width": "w-full", + "loglevel": "error" + }, + + "SEARCH_ITEM_MESSAGE_ERROR_AUTH": { + "msgid": "SEARCH_INDEX_E_0001", + "msgstr": "message.error.auth", + "position": "", + "width": "w-full", + "loglevel": "error" + }, + "SEARCH_ITEM_MESSAGE_ERROR_SERVER": { + "msgid": "SEARCH_INDEX_E_0002", + "msgstr": "message.error.server", + "position": "", + "width": "w-full", + "loglevel": "error" + }, + "SEARCH_ITEM_MESSAGE_ERROR_REQUEST": { + "msgid": "SEARCH_INDEX_E_0003", + "msgstr": "message.error.search", + "position": "", + "width": "w-full", + "loglevel": "error" + }, + "SEARCH_ITEM_MESSAGE_ERROR_FETCH": { + "msgid": "SEARCH_INDEX_E_0004", + "msgstr": "message.error.fetch", + "position": "", + "width": "w-full", + "loglevel": "error" + }, + "SEARCH_DOWNLOAD_MESSAGE_ERROR_AUTH": { + "msgid": "SEARCH_INDEX_E_0005", + "msgstr": "message.error.auth", + "position": "", + "width": "w-full", + "loglevel": "error" + }, + "SEARCH_DOWNLOAD_MESSAGE_ERROR_SERVER": { + "msgid": "SEARCH_INDEX_E_0006", + "msgstr": "message.error.server", + "position": "", + "width": "w-full", + "loglevel": "error" + }, + "SEARCH_DOWNLOAD_MESSAGE_ERROR_RESULT": { + "msgid": "SEARCH_INDEX_E_0007", + "msgstr": "message.error.downloadResult", + "position": "", + "width": "w-full", + "loglevel": "error" + }, + "SEARCH_DOWNLOAD_MESSAGE_ERROR_FETCH": { + "msgid": "SEARCH_INDEX_E_0008", + "msgstr": "message.error.fetch", + "position": "", + "width": "w-full", + "loglevel": "error" + }, + "SEARCH_INDEX_MESSAGE_ERROR": { + "msgid": "SEARCH_INDEX_E_0009", + "msgstr": "message.error.error", + "position": "", + "width": "w-full", + "loglevel": "error" + }, + "DOWNLOAD_RANK_MESSAGE_ERROR_DOWNLOAD": { + "msgid": "DOWNLOAD_RANK_E_0001", + "msgstr": "message.error.download", + "position": "", + "width": "w-full", + "loglevel": "error" + }, + "DOWNLOAD_RANK_MESSAGE_ERROR_FETCH": { + "msgid": "DOWNLOAD_RANK_E_0002", + "msgstr": "message.error.fetch", + "position": "", + "width": "w-full", + "loglevel": "error" + }, + "TABLE_STYLE_MESSAGE_ERROR_DOWNLOAD": { + "msgid": "TABLE_STYLE_E_0001", + "msgstr": "message.error.download", + "position": "", + "width": "w-full", + "loglevel": "error" + }, + "TABLE_STYLE_MESSAGE_ERROR_FETCH": { + "msgid": "TABLE_STYLE_E_0002", + "msgstr": "message.error.fetch", + "position": "", + "width": "w-full", + "loglevel": "error" + }, + "TABLE_STYLE_MESSAGE_ERROR_PREVIEW": { + "msgid": "TABLE_STYLE_E_0003", + "msgstr": "message.error.preview", + "position": "", + "width": "w-full", + "loglevel": "error" + }, + "TABLE_STYLE_MESSAGE_ERROR_FETCH_PREVIEW": { + "msgid": "TABLE_STYLE_E_0004", + "msgstr": "message.error.fetch", + "position": "", + "width": "w-full", + "loglevel": "error" + }, + "VIEWS_NUMBER_MESSAGE_ERROR": { + "msgid": "VIEWS_NUMBER_E_0001", + "msgstr": "message.error.error", + "position": "", + "width": "w-full", + "loglevel": "error" + }, + "VIEWS_NUMBER_MESSAGE_ERROR_GET_ITEM": { + "msgid": "VIEWS_NUMBER_E_0002", + "msgstr": "message.error.getItemViewsNumber", + "position": "", + "width": "w-full", + "loglevel": "error" + }, + "VIEWS_NUMBER_MESSAGE_ERROR_FETCH": { + "msgid": "VIEWS_NUMBER_E_0003", + "msgstr": "message.error.fetch", + "position": "", + "width": "w-full", + "loglevel": "error" + } +} diff --git a/nginx/ams/weko-frontend/assets/sass/common.scss b/nginx/ams/weko-frontend/assets/sass/common.scss index 21c110977f..ee53f5d30f 100644 --- a/nginx/ams/weko-frontend/assets/sass/common.scss +++ b/nginx/ams/weko-frontend/assets/sass/common.scss @@ -7,7 +7,7 @@ @include icons; width: 20px; height: 20px; - background-image: url(/img/icon/icon_language.svg); + background-image: url(/img/ams/icon/icon_language.svg); padding-left: 0px; // vertical-align: baseline; margin-bottom: 3px; @@ -24,7 +24,7 @@ @include icons; width: 10px; height: 7px; - background-image: url(/img/icon/icon_down-arrow.svg); + background-image: url(/img/ams/icon/icon_down-arrow.svg); margin-left: 5px; vertical-align: middle; @@ -40,7 +40,7 @@ @include icons; width: 14px; height: 14px; - background-image: url(/img/icon/icon_language02.svg); + background-image: url(/img/ams/icon/icon_language02.svg); padding-right: 10px; vertical-align: baseline; } @@ -59,7 +59,7 @@ @include icons; width: 10px; height: 7px; - background-image: url(/img/icon/icon_down-arrow-bk.svg); + background-image: url(/img/ams/icon/icon_down-arrow-bk.svg); margin-left: 5px; vertical-align: middle; } @@ -68,7 +68,7 @@ @include icons; width: 10px; height: 7px; - background-image: url(/img/icon/icon_up-arrow-bk.svg); + background-image: url(/img/ams/icon/icon_up-arrow-bk.svg); margin-left: 5px; vertical-align: middle; } @@ -77,7 +77,7 @@ @include icons; width: 10px; height: 10px; - background-image: url(/img/icon/icon_left-arrow-bk.svg); + background-image: url(/img/ams/icon/icon_left-arrow-bk.svg); margin-right: 5px; vertical-align: baseline; } @@ -86,7 +86,7 @@ @include icons; width: 10px; height: 10px; - background-image: url(/img/icon/icon_right-arrow-bk.svg); + background-image: url(/img/ams/icon/icon_right-arrow-bk.svg); margin-left: 5px; margin-right: 0; vertical-align: baseline; @@ -96,21 +96,21 @@ @include icons; width: 17px; height: 17px; - background-image: url(/img/icon/icon_login.svg); + background-image: url(/img/ams/icon/icon_login.svg); } &.icon-out::before { @include icons; width: 17px; height: 17px; - background-image: url(/img/icon/icon_logout.svg); + background-image: url(/img/ams/icon/icon_logout.svg); } &.icon-menu::before { @include icons; width: 17px; height: 17px; - background-image: url(/img/icon/icon_menu.svg); + background-image: url(/img/ams/icon/icon_menu.svg); } &.icon-search::before { @@ -118,63 +118,63 @@ width: 16px; height: 16px; vertical-align: baseline; - background-image: url(/img/icon/icon_search.svg); + background-image: url(/img/ams/icon/icon_search.svg); } &.icon-listsearch::before { @include icons; width: 22px; height: 15px; - background-image: url(/img/icon/icon_detailed-search.svg); + background-image: url(/img/ams/icon/icon_detailed-search.svg); } &.icon-mylist::before { @include icons; width: 22px; height: 15px; - background-image: url(/img/icon/icon_mylist.svg); + background-image: url(/img/ams/icon/icon_mylist.svg); } &.icon-mylist-b::before { @include icons; width: 22px; height: 15px; - background-image: url(/img/icon/icon_mylist-blue.svg); + background-image: url(/img/ams/icon/icon_mylist-blue.svg); } &.icon-nord::before { @include icons; width: 14px; height: 16px; - background-image: url(/img/icon/icon_data.svg); + background-image: url(/img/ams/icon/icon_data.svg); } &.icon-norf::before { @include icons; width: 14px; height: 16px; - background-image: url(/img/icon/icon_file.svg); + background-image: url(/img/ams/icon/icon_file.svg); } &.icon-thesis::before { @include icons; width: 14px; height: 16px; - background-image: url(/img/icon/icon_thesis.svg); + background-image: url(/img/ams/icon/icon_thesis.svg); } &.icon-noro::before { @include icons; width: 14px; height: 16px; - background-image: url(/img/icon/icon_organization.svg); + background-image: url(/img/ams/icon/icon_organization.svg); } &.icon-news::before { @include icons; width: 18px; height: 18px; - background-image: url(/img/icon/icon_feed.svg); + background-image: url(/img/ams/icon/icon_feed.svg); } &.icon-info::before { @@ -182,7 +182,7 @@ vertical-align: sup; width: 20px; height: 20px; - background-image: url(/img/icon/icon_info.svg); + background-image: url(/img/ams/icon/icon_info.svg); } &.icon-publish::before { @@ -190,14 +190,14 @@ width: 13px; height: 13px; vertical-align: baseline; - background-image: url(/img/icon/icon_upload-date.svg); + background-image: url(/img/ams/icon/icon_upload-date.svg); } &.icon-update::before { @include icons; width: 13px; height: 13px; - background-image: url(/img/icon/icon_update-date.svg); + background-image: url(/img/ams/icon/icon_update-date.svg); } &.icon-rank::before { @@ -205,7 +205,7 @@ width: 21px; height: 15px; margin-right: 10px; - background-image: url(/img/icon/icon_ranking.svg); + background-image: url(/img/ams/icon/icon_ranking.svg); } &.icon-dl-rank::before { @@ -213,7 +213,7 @@ width: 20px; height: 20px; margin-right: 10px; - background-image: url(/img/icon/icon_dl-rank.svg); + background-image: url(/img/ams/icon/icon_dl-rank.svg); } &.icon-statistics::before { @@ -221,7 +221,7 @@ width: 17px; height: 17px; margin-right: 10px; - background-image: url(/img/icon/icon_statistics.svg); + background-image: url(/img/ams/icon/icon_statistics.svg); } &.icon-export::before { @@ -229,7 +229,7 @@ width: 22px; height: 22px; margin-right: 10px; - background-image: url(/img/icon/icon_export.svg); + background-image: url(/img/ams/icon/icon_export.svg); } &.icon-mail::before { @@ -237,7 +237,7 @@ width: 24px; height: 24px; margin-right: 10px; - background-image: url(/img/icon/icon_mail.svg); + background-image: url(/img/ams/icon/icon_mail.svg); } &.icon-external { @@ -246,7 +246,7 @@ @include icons; width: 10px; height: 10px; - background-image: url(/img/icon/icon_external.svg); + background-image: url(/img/ams/icon/icon_external.svg); } } @@ -255,7 +255,7 @@ width: 27px; height: 21px; margin-right: 10px; - background-image: url(/img/icon/icon_item.svg); + background-image: url(/img/ams/icon/icon_item.svg); } &.icon-index::before { @@ -264,10 +264,10 @@ height: 21px; vertical-align: bottom; margin-right: 10px; - background-image: url(/img/icon/icon_plus01.svg); + background-image: url(/img/ams/icon/icon_plus01.svg); .active & { - background-image: url(/img/icon/icon_minus.svg); + background-image: url(/img/ams/icon/icon_minus.svg); } } @@ -276,7 +276,7 @@ width: 24px; height: 24px; margin-left: 10px; - background-image: url(/img/icon/icon_remove.svg); + background-image: url(/img/ams/icon/icon_remove.svg); } &.icon-minus::before { @@ -284,7 +284,7 @@ width: 19px; height: 21px; margin-right: 10px; - background-image: url(/img/icon/icon_minus.svg); + background-image: url(/img/ams/icon/icon_minus.svg); vertical-align: bottom; } @@ -292,14 +292,14 @@ @include icons; width: 21px; height: 21px; - background-image: url(/img/icon/icon_search-results.svg); + background-image: url(/img/ams/icon/icon_search-results.svg); } &.icon-filter::before { @include icons; width: 22px; height: 15px; - background-image: url(/img/icon/icon_filter.svg); + background-image: url(/img/ams/icon/icon_filter.svg); } &.icon-table::before { @@ -307,7 +307,7 @@ width: 22px; height: 15px; margin-right: 3px; - background-image: url(/img/icon/icon_item-display.svg); + background-image: url(/img/ams/icon/icon_item-display.svg); } &.icon-display { @@ -322,31 +322,31 @@ &.display1 { &::before { - background-image: url(/img/icon/icon_summary_inactive.svg); + background-image: url(/img/ams/icon/icon_summary_inactive.svg); } &.active::before { - background-image: url(/img/icon/icon_summary_active.svg); + background-image: url(/img/ams/icon/icon_summary_active.svg); } } &.display2 { &::before { - background-image: url(/img/icon/icon_table_inactive.svg); + background-image: url(/img/ams/icon/icon_table_inactive.svg); } &.active::before { - background-image: url(/img/icon/icon_table_active.svg); + background-image: url(/img/ams/icon/icon_table_active.svg); } } &.display3 { &::before { - background-image: url(/img/icon/icon_block_inactive.svg); + background-image: url(/img/ams/icon/icon_block_inactive.svg); } &.active::before { - background-image: url(/img/icon/icon_block_active.svg); + background-image: url(/img/ams/icon/icon_block_active.svg); } } } @@ -355,7 +355,7 @@ &::before { @include icon-display; background-size: 26px 14px; - background-image: url(/img/icon/icon_sort01.svg); + background-image: url(/img/ams/icon/icon_sort01.svg); } &.desc::before { @@ -369,7 +369,7 @@ @include icons; width: 13px; height: 13px; - background-image: url(/img/icon/icon_download.svg); + background-image: url(/img/ams/icon/icon_download.svg); } } @@ -378,7 +378,7 @@ margin-right: 10px; width: 14px; height: 16px; - background-image: url(/img/icon/icon_add.svg); + background-image: url(/img/ams/icon/icon_add.svg); } &.icon-date::after { @@ -386,7 +386,7 @@ margin-right: 10px; width: 10px; height: 10px; - background-image: url(/img/icon/icon_calendar.svg); + background-image: url(/img/ams/icon/icon_calendar.svg); } &.icon-checkbox { @@ -435,19 +435,19 @@ } &.icon-group::before { - background-image: url(/img/icon/icon_group.svg); + background-image: url(/img/ams/icon/icon_group.svg); } &.icon-member::before { - background-image: url(/img/icon/icon_member.svg); + background-image: url(/img/ams/icon/icon_member.svg); } &.icon-private::before { - background-image: url(/img/icon/icon_private.svg); + background-image: url(/img/ams/icon/icon_private.svg); } &.icon-public::before { - background-image: url(/img/icon/icon_public.svg); + background-image: url(/img/ams/icon/icon_public.svg); } } @@ -460,25 +460,25 @@ &.icon-preview::before { width: 12px; height: 12px; - background-image: url(/img/icon/icon_preview.svg); + background-image: url(/img/ams/icon/icon_preview.svg); } &.icon-download::before { width: 12px; height: 12px; - background-image: url(/img/icon/icon_download-bk.svg); + background-image: url(/img/ams/icon/icon_download-bk.svg); } &.icon-info-bk::before { width: 12px; height: 12px; - background-image: url(/img/icon/icon_information-bk.svg); + background-image: url(/img/ams/icon/icon_information-bk.svg); } &.icon-approval::before { width: 12px; height: 12px; - background-image: url(/img/icon/icon_approval.svg); + background-image: url(/img/ams/icon/icon_approval.svg); } } @@ -487,7 +487,7 @@ @include icons; width: 14px; height: 7px; - background-image: url(/img/icon/icon_down-arrow.svg); + background-image: url(/img/ams/icon/icon_down-arrow.svg); vertical-align: middle; margin-right: 12px; } @@ -498,7 +498,7 @@ @include icons; width: 14px; height: 7px; - background-image: url(/img/icon/icon_up-arrow.svg); + background-image: url(/img/ams/icon/icon_up-arrow.svg); vertical-align: middle; margin-right: 12px; } @@ -975,7 +975,7 @@ dialog { color: $miby-black; font-weight: 500; cursor: pointer; - list-style-image: url(/img/icon/icon_plus01.svg); + list-style-image: url(/img/ams/icon/icon_plus01.svg); &::before { content: ''; @@ -983,7 +983,7 @@ dialog { left: 0; width: 19px; height: 21px; - background-image: url(/img/icon/icon_plus01.svg); + background-image: url(/img/ams/icon/icon_plus01.svg); background-position: center; background-size: 19px 21px; background-repeat: no-repeat; @@ -994,7 +994,7 @@ dialog { font-weight: 700; &::before { - background-image: url(/img/icon/icon_minus.svg); + background-image: url(/img/ams/icon/icon_minus.svg); } } } @@ -1019,7 +1019,7 @@ dialog { height: 25px; margin-right: 10px; margin-top: 1px; - background-image: url(/img/icon/icon_rhombus.svg); + background-image: url(/img/ams/icon/icon_rhombus.svg); background-position: center; background-size: 19px 21px; background-repeat: no-repeat; @@ -1083,7 +1083,7 @@ dialog { select { &#AddCondition { &:not([size]) { - background-image: url(/img/icon/icon_down-arrow.svg); + background-image: url(/img/ams/icon/icon_down-arrow.svg); background-size: 10px 7px; padding-right: 2rem; } @@ -1097,7 +1097,7 @@ select { margin-right: 10px; width: 10px; height: 10px; - background-image: url(/img/icon/icon_add.svg); + background-image: url(/img/ams/icon/icon_add.svg); } } } @@ -1179,7 +1179,7 @@ input[type='file'] { border-color: $miby-link-blue; background-color: $miby-link-blue; cursor: pointer; - background-image: url(/img/icon/icon_check.svg); + background-image: url(/img/ams/icon/icon_check.svg); background-repeat: no-repeat; background-size: 100%; vertical-align: text-top; diff --git a/nginx/ams/weko-frontend/assets/sass/styles.scss b/nginx/ams/weko-frontend/assets/sass/styles.scss index 0668053f9a..2cbea04804 100644 --- a/nginx/ams/weko-frontend/assets/sass/styles.scss +++ b/nginx/ams/weko-frontend/assets/sass/styles.scss @@ -96,7 +96,7 @@ right: 20px; width: 12px; height: 12px; - background-image: url(/img/icon/icon_close02.svg); + background-image: url(/img/ams/icon/icon_close02.svg); background-position: center; background-size: 12px; background-repeat: no-repeat; @@ -115,7 +115,7 @@ width: 20px; height: 20px; vertical-align: bottom; - background-image: url(/img/icon/icon_q.svg); + background-image: url(/img/ams/icon/icon_q.svg); } } } @@ -133,7 +133,7 @@ width: 20px; height: 20px; vertical-align: bottom; - background-image: url(/img/icon/icon_a.svg); + background-image: url(/img/ams/icon/icon_a.svg); } } @@ -182,3 +182,25 @@ } } } + +.text-divider { + display: flex; + align-items: center; + margin-top: 1rem; + margin-bottom: 1rem; + padding-left: 40px; + padding-right: 40px; +} +.text-divider::before, +.text-divider::after { + content: ''; + height: 1px; + background-color: #a3a3a3; + flex-grow: 1; +} +.text-divider::before { + margin-right: 1rem; +} +.text-divider::after { + margin-left: 1rem; +} diff --git a/nginx/ams/weko-frontend/components/common/Alert.vue b/nginx/ams/weko-frontend/components/common/Alert.vue index f68775dba7..f196eed28d 100644 --- a/nginx/ams/weko-frontend/components/common/Alert.vue +++ b/nginx/ams/weko-frontend/components/common/Alert.vue @@ -92,7 +92,12 @@ stroke-width="2" d="M10 14l2-2m0 0l2-2m-2 2l-2-2m2 2l2 2m7-2a9 9 0 11-18 0 9 9 0 0118 0z" /> - {{ $t(message) + (code ? ' (' + code + ')' : '') }} + + {{ $t('message.error.oauthError', { time: transitionSecond }) }} + {{ loginPage }} + {{ code ? ' (' + code + ')' : '' }} + + {{ $t(message) + (code ? ' (' + code + ')' : '') }}
@@ -325,6 +325,7 @@ const titleSearchType = reactive({ name: 'exactMatch' } }); +const appConf = useAppConfig(); /* /////////////////////////////////// // function @@ -414,7 +415,7 @@ function search() { emits('clickSearch'); } else { sessionStorage.setItem('conditions', JSON.stringify(conditions)); - navigateTo('/search'); + navigateTo(`${appConf.amsPath ?? ''}/search`); } } @@ -592,6 +593,7 @@ try { $fetch(useAppConfig().wekoApi + '/records', { timeout: useRuntimeConfig().public.apiTimeout, method: 'GET', + credentials: 'omit', headers: { 'Cache-Control': 'no-store', Pragma: 'no-cache', @@ -610,6 +612,7 @@ try { $fetch(useAppConfig().wekoApi + '/records', { timeout: useRuntimeConfig().public.apiTimeout, method: 'GET', + credentials: 'omit', headers: { 'Cache-Control': 'no-store', Pragma: 'no-cache', @@ -643,6 +646,7 @@ try { await $fetch(useAppConfig().wekoApi + '/tree/index', { timeout: useRuntimeConfig().public.apiTimeout, method: 'GET', + credentials: 'omit', headers: { 'Cache-Control': 'no-store', Pragma: 'no-cache', diff --git a/nginx/ams/weko-frontend/components/common/modal/CreaterInfo.vue b/nginx/ams/weko-frontend/components/common/modal/CreaterInfo.vue index 90488fe568..f623380bf7 100644 --- a/nginx/ams/weko-frontend/components/common/modal/CreaterInfo.vue +++ b/nginx/ams/weko-frontend/components/common/modal/CreaterInfo.vue @@ -7,7 +7,7 @@
@@ -55,6 +55,7 @@ defineExpose({ /////////////////////////////////// */ const modalShowFlag = ref(false); +const appConf = useAppConfig(); /* /////////////////////////////////// // function diff --git a/nginx/ams/weko-frontend/components/common/modal/DetailSearch.vue b/nginx/ams/weko-frontend/components/common/modal/DetailSearch.vue index 7f805c4ed4..29756cd2e6 100644 --- a/nginx/ams/weko-frontend/components/common/modal/DetailSearch.vue +++ b/nginx/ams/weko-frontend/components/common/modal/DetailSearch.vue @@ -10,7 +10,7 @@
@@ -196,6 +196,7 @@ const conditions = reactive({ type: '0', keyword: '', detail: {}, detailData: {} const columnList = ref([]); const selected = ref(selectorDefault); let selector = JSON.parse(JSON.stringify(DetailColumn)); +const appConf = useAppConfig(); /* /////////////////////////////////// // function @@ -280,7 +281,7 @@ function search() { closeModal(); } else { sessionStorage.setItem('conditions', JSON.stringify(conditions)); - navigateTo('/search'); + navigateTo(`${appConf.amsPath ?? ''}/search`); closeModal(); } } @@ -358,6 +359,7 @@ try { await $fetch(useAppConfig().wekoApi + '/tree/index', { timeout: useRuntimeConfig().public.apiTimeout, method: 'GET', + credentials: 'omit', headers: { 'Cache-Control': 'no-store', Pragma: 'no-cache', diff --git a/nginx/ams/weko-frontend/components/contact/modal/ContactConfirm.vue b/nginx/ams/weko-frontend/components/contact/modal/ContactConfirm.vue index e41ee1c1fb..96b706df0d 100644 --- a/nginx/ams/weko-frontend/components/contact/modal/ContactConfirm.vue +++ b/nginx/ams/weko-frontend/components/contact/modal/ContactConfirm.vue @@ -10,7 +10,7 @@
@@ -192,7 +192,7 @@ function getCaptcha() { dirtyAnswer.value = false; answeResult.value = false; - $fetch(appConf.wekoApi + '/captcha/image', { + $fetch(`${appConf.amsApi ?? '/api'}/captcha/image`, { timeout: useRuntimeConfig().public.apiTimeout, method: 'GET', headers: { @@ -227,7 +227,7 @@ async function send() { locale.value = String(localStorage.getItem('locale')); const contactType = t(props.type); - await useFetch('/api/mail/send', { + await useFetch(`${appConf.amsApi ?? '/api'}/mail/send`, { method: 'POST', body: JSON.stringify({ key: captchaKey, diff --git a/nginx/ams/weko-frontend/components/detail/DownloadRank.vue b/nginx/ams/weko-frontend/components/detail/DownloadRank.vue index e359364acf..f03228eec2 100644 --- a/nginx/ams/weko-frontend/components/detail/DownloadRank.vue +++ b/nginx/ams/weko-frontend/components/detail/DownloadRank.vue @@ -43,6 +43,7 @@ diff --git a/nginx/ams/weko-frontend/components/detail/ViewsNumber.vue b/nginx/ams/weko-frontend/components/detail/ViewsNumber.vue index 53e7251e78..b7c7ac3dd4 100644 --- a/nginx/ams/weko-frontend/components/detail/ViewsNumber.vue +++ b/nginx/ams/weko-frontend/components/detail/ViewsNumber.vue @@ -30,6 +30,7 @@ diff --git a/nginx/ams/weko-frontend/pages/files.vue b/nginx/ams/weko-frontend/pages/ams/files.vue similarity index 87% rename from nginx/ams/weko-frontend/pages/files.vue rename to nginx/ams/weko-frontend/pages/ams/files.vue index 8178895a53..30106651af 100644 --- a/nginx/ams/weko-frontend/pages/files.vue +++ b/nginx/ams/weko-frontend/pages/ams/files.vue @@ -170,7 +170,7 @@ {{ $t('comment') }} - + - Download + Download {{ $t('download') }} ({{ selectedFiles.length }} {{ $t('items') }}) @@ -209,18 +209,14 @@ - + diff --git a/nginx/ams/weko-frontend/pages/logout.vue b/nginx/ams/weko-frontend/pages/ams/logout.vue similarity index 90% rename from nginx/ams/weko-frontend/pages/logout.vue rename to nginx/ams/weko-frontend/pages/ams/logout.vue index 4f2fbeb864..d97fa92976 100644 --- a/nginx/ams/weko-frontend/pages/logout.vue +++ b/nginx/ams/weko-frontend/pages/ams/logout.vue @@ -2,7 +2,7 @@
- AMS Logo + AMS Logo
- Logout + Logout {{ $t('logout') }}
@@ -49,13 +49,14 @@ /////////////////////////////////// */ const isLogout = ref(false); +const appConf = useAppConfig(); /* /////////////////////////////////// // function /////////////////////////////////// */ function logout() { - $fetch(useAppConfig().wekoApi + '/logout', { + $fetch(appConf.wekoApi + '/logout', { timeout: useRuntimeConfig().public.apiTimeout, method: 'POST', onResponse() { diff --git a/nginx/ams/weko-frontend/pages/preview.vue b/nginx/ams/weko-frontend/pages/ams/preview.vue similarity index 100% rename from nginx/ams/weko-frontend/pages/preview.vue rename to nginx/ams/weko-frontend/pages/ams/preview.vue diff --git a/nginx/ams/weko-frontend/pages/search/[id].vue b/nginx/ams/weko-frontend/pages/ams/search/[id].vue similarity index 76% rename from nginx/ams/weko-frontend/pages/search/[id].vue rename to nginx/ams/weko-frontend/pages/ams/search/[id].vue index d53bfbc6ef..d758860507 100644 --- a/nginx/ams/weko-frontend/pages/search/[id].vue +++ b/nginx/ams/weko-frontend/pages/ams/search/[id].vue @@ -6,16 +6,13 @@
- + {{ index.name }} {{ index.name }} - / + /
@@ -109,16 +106,14 @@ - +