Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

two errors while vagrant up on islandora-playbook repository #1

Open
wants to merge 109 commits into
base: 7.x
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
109 commits
Select commit Hold shift + click to select a range
56c2afc
Add orphaned objects capability to core
Dec 6, 2017
2e17b7d
Add Islandora to various descriptions and titles
Dec 12, 2017
962782c
Simplify and make a single query
Jan 17, 2018
4dba1b2
ISLANDORA-2153: Allow datastreams with no MIME type restrictions to b…
DiegoPino Feb 3, 2018
bb19d99
Amend SPARQL query to exclude objects with any living parent.
Feb 26, 2018
3a25a1f
Make permissions work
Feb 26, 2018
5894477
XACML OK
Feb 26, 2018
92a9096
Permissions
Feb 26, 2018
ecca265
Change query to SELECT DISTINCT, remove ?p ?otherobject
Feb 26, 2018
bc2918c
Function names and delete path
Feb 27, 2018
7b5a601
Show list of objects to confirmation page
Feb 27, 2018
34ff60a
Add warning to report page
Feb 27, 2018
31a5e87
Rename functions and define permissions constant
Feb 27, 2018
5ecc9aa
Remove quotes from permissions
Feb 27, 2018
f62b91e
Coding standards
Feb 27, 2018
898c553
Coding standards, and remove unneeded variable.
Feb 27, 2018
d443a7c
Turn list of pids_to_delete into an array, and correct warning text
Mar 5, 2018
3c2cc26
Remove unnecessary code
Mar 5, 2018
f299fb7
Remove quotes from access arguments
Mar 7, 2018
1f22788
ISLANDORA-2073 Don't allow datastreams if object is forbidden. (#698)
rosiel Mar 7, 2018
124b399
Ensure object/ds are accessible before verifying token. (#701)
jordandukart Mar 8, 2018
deca176
Fix pid undefined constant
Mar 12, 2018
9eb5a0a
Removing jenkins and doxygen stuff (#700)
dannylamb Mar 16, 2018
62048f5
Update module maintainer in README, use HTTPS for GitHub (#702)
bencomp Mar 19, 2018
482c9e6
Add error message for delete failure
Mar 20, 2018
61d1ea3
Merge pull request #699 from mnylc/7.x-ISLANDORA-2153
mjordan Mar 21, 2018
b8c21bd
Merge pull request #697 from bondjimbond/orphans
mjordan Mar 22, 2018
dfaa6ed
Respect namespace restrictions in manage deleted objects.
whikloj Mar 23, 2018
51b01c5
Merge pull request #703 from whikloj/7.x-ISLANDORA-2178
bondjimbond Mar 28, 2018
42fa70c
Prevent Warning
jonathangreen Apr 11, 2018
7d9cdc2
Code review feedback
jonathangreen Apr 13, 2018
558cb6d
Merge pull request #704 from jonathangreen/warning
DiegoPino Apr 23, 2018
d05707f
Documentation of new permission and add screenshot to README.
rosiel May 21, 2018
3144ada
Update README.md for style.
rosiel May 27, 2018
d8b8b4f
ISLANDORA-1748 -- add hook_islandora_datastream_filename_alter(). (#706)
patdunlavey May 27, 2018
1c7e041
Merge pull request #707 from rosiel/7.x-documentation
DiegoPino Jun 12, 2018
7f3d781
made logging messages more accurate (#709)
ajstanley Sep 6, 2018
6ada7c4
Adds Jon Green to README maintainer list
bryjbrown Oct 2, 2018
e576c33
Merge pull request #711 from bryjbrown/7.x-1.12-audit
DiegoPino Oct 2, 2018
f3b3ffc
Allow orphaned object report to find orphaned compound objects. (#710)
jonathangreen Oct 9, 2018
7a319ce
Update PULL_REQUEST_TEMPLATE.md
manez Nov 29, 2018
2519954
Update PULL_REQUEST_TEMPLATE.md
manez Nov 29, 2018
d6679cb
Form_load_include the file.
jordandukart Dec 17, 2018
86a6d0a
Merge pull request #713 from jordandukart/7.x-ISLANDORA-2359
DiegoPino Dec 19, 2018
f457a4a
Merge pull request #712 from manez/7.x
bondjimbond Jan 10, 2019
a46936c
Install drush with composer (#714)
whikloj Feb 12, 2019
e3bf90e
fix test runner and document travis scripts (#715)
whikloj Feb 12, 2019
5642dbe
Allow custom codesniffer ignore arguments (#716)
whikloj Feb 22, 2019
bcfe5c2
Type as bool.
jordandukart Feb 27, 2019
3b04eed
Merge pull request #717 from jordandukart/7.x
whikloj Feb 28, 2019
cdc8ccf
Typing.
jordandukart Mar 29, 2019
2be8d5a
Merge pull request #718 from jordandukart/7.x
whikloj Apr 1, 2019
1ef7ca3
Allow PHP 5.3.3 to fail
whikloj May 3, 2019
525283c
Coder
whikloj May 3, 2019
dd77f60
Remove extra newline
whikloj May 3, 2019
df66c5a
Add mods to dc transform
May 6, 2019
07f7b34
Document hook for Travis
May 16, 2019
e1d8b77
Fix travis tuque warning
May 21, 2019
13d87d4
Another attempt to fix travis
May 21, 2019
147dc73
Last try at travis
May 21, 2019
acac16d
one more try with travis
May 22, 2019
5c32aee
Try again with Travis
May 22, 2019
daffe53
Final fix for Travis
May 22, 2019
ab0734e
Dumb paste errors
May 22, 2019
86719d1
TRAVIS
May 22, 2019
e165da1
Sigh travis
May 22, 2019
da2203f
Travis is very picky
May 23, 2019
d01c5a0
See if Travis likes this
May 23, 2019
80481e6
Tell dcs to ignore deprecation message
May 24, 2019
e15544f
Merge pull request #720 from whikloj/7.x-ISLANDORA-2424
DiegoPino May 24, 2019
d48b756
get rid of deprecation stuff
May 27, 2019
aa527e4
Merge branch '7.x' of https://github.com/Islandora/islandora into cen…
May 27, 2019
a7bf4da
Merge pull request #721 from bondjimbond/centralize_dc
DiegoPino May 28, 2019
84be1af
Add datastream paths to list of admin paths
Jun 12, 2019
bfb57b2
ISLANDORA-2444 Update readme with Awesome link
manez Jun 13, 2019
45c4410
Explicitly list version paths to make admin paths
Jun 19, 2019
eb2c412
Merge pull request #724 from manez/7.x
bondjimbond Jun 20, 2019
f5ff5a1
Merge pull request #723 from mghughes/7.x-datastream-admin-paths
DiegoPino Jul 16, 2019
90414e5
Stop running "style" coder check (#722)
whikloj Jul 16, 2019
a36b648
Fix islandora for latest 3.6 coding standard update.
jonathangreen Oct 3, 2019
3a94b6a
Merge pull request #728 from jonathangreen/fix_codesniffer
whikloj Oct 10, 2019
6f58ace
Dummy composer.json to see if it'll appease packagist
dannylamb Oct 17, 2019
02b7b2b
Merge pull request #734 from dannylamb/7-x-packagist
whikloj Oct 17, 2019
08d0fd7
Revert "Dummy composer.json to see if it'll appease packagist"
whikloj Oct 18, 2019
0044efd
Add optional label text to datastream download links
dheles Oct 22, 2019
8a2a354
Merge pull request #738 from Islandora/revert-734-7-x-packagist
DiegoPino Oct 23, 2019
52010c8
Merge pull request #727 from dheles/7.x-ISLANDORA-2480
DiegoPino Oct 24, 2019
5e88176
Fix theme_islandora_datastream_view_link() (#726)
dheles Nov 1, 2019
064b115
Add Solr option for Orphaned Objects list
Nov 2, 2020
2f3a886
Clean up comments
Nov 2, 2020
06163b7
Make sure each parent object is loaded only once
Nov 4, 2020
9403d3b
Style cleanup
Nov 4, 2020
ea2bc27
Remove debug
Nov 23, 2020
061ead2
Convert islandora_object_load to a solr query
Nov 23, 2020
4277530
Fix the php error
Nov 23, 2020
a3cb1ba
Merge pull request #1 from bondjimbond/solr_pid
bondjimbond Nov 23, 2020
404221a
review from bryjbrown
Nov 24, 2020
29f88b8
Merge pull request #2 from bondjimbond/solr_pid
bondjimbond Nov 24, 2020
155b2bd
Add new variable to install file
Nov 24, 2020
e7d0030
Merge pull request #3 from bondjimbond/solr_pid
bondjimbond Nov 24, 2020
a7ebc54
Fix travis and failing file
Nov 25, 2020
e2fdb9e
Travis
Nov 25, 2020
dc12d52
foreach fix
Nov 25, 2020
430b500
Merge pull request #807 from bondjimbond/7.x
bryjbrown Nov 30, 2020
64334d2
Exclude configured root from orphans list
Nov 30, 2020
f36f2da
Exclude root collection from orphans list
Nov 30, 2020
cb1e47e
More efficient IFs
Dec 1, 2020
4258cfa
Travis
Dec 1, 2020
c34c7ac
Merge pull request #813 from bondjimbond/parent_fix
bryjbrown Dec 2, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
!!!!!! PLEASE NOTE: The text below is a template to give us the information we need to act on your pull request. Please delete or mark N/A on any questions that do not apply to your pull request. Please DO NOT leave the default text OR this text in place when you submit your pull request!!!!!!


**JIRA Ticket**: (link)

* Other Relevant Links (Google Groups discussion, related pull requests, Release pull requests, etc.)
Expand Down Expand Up @@ -27,7 +30,7 @@ A description of what steps someone could take to:
Any additional information that you think would be helpful when reviewing this PR.

Example:
* Does this change require documentation to be updated?
* Does this change the interface, add a new feature, or otherwise change behaviours that would require updating documentation?
* Does this change add any new dependencies?
* Does this change require any other modifications to be made to the repository (ie. Regeneration activity, etc.)?
* Could this change impact execution of existing code?
Expand Down
23 changes: 16 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,20 @@ language: php

matrix:
include:
#5.3.3 Ubuntu Precise exceptions
#5.3.3 Ubuntu Precise exceptions
- php: 5.3.3
dist: precise
env: FEDORA_VERSION="3.5"
- php: 5.3.3
dist: precise
env: FEDORA_VERSION="3.6.2"
- php: 5.3.3
dist: precise
env: FEDORA_VERSION="3.7.0"
- php: 5.3.3
dist: precise
env: FEDORA_VERSION="3.8.1"
allow_failures:
- php: 5.3.3
dist: precise
env: FEDORA_VERSION="3.5"
Expand Down Expand Up @@ -43,13 +56,9 @@ before_install:
before_script:
# Mysql might time out for long tests, increase the wait timeout.
- mysql -e 'SET @@GLOBAL.wait_timeout=1200'

script:
- ant -buildfile sites/all/modules/islandora/build.xml lint
- $ISLANDORA_DIR/tests/scripts/line_endings.sh sites/all/modules/islandora
- drush coder-review --reviews=production,security,style,i18n,potx,sniffer islandora
- phpcpd --names *.module,*.inc,*.test sites/all/modules/islandora
- php scripts/run-tests.sh --php `phpenv which php` --url http://localhost:8081 --verbose "Islandora"
- $ISLANDORA_DIR/tests/scripts/travis_scripts.sh
- $ISLANDORA_DIR/tests/scripts/run_tests.sh "Islandora"
after_failure:
- $ISLANDORA_DIR/tests/scripts/travis_after_failure.sh
notifications:
Expand Down
42 changes: 27 additions & 15 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

## Introduction

Islandora Fedora Repository Module
This module includes the core functionality for interacting with Fedora Repository objects through the Drupal interface.

For installation and customization instructions please see the [documentation and the DuraSpace Wiki](https://wiki.duraspace.org/display/ISLANDORA/Islandora).

Expand All @@ -24,39 +24,51 @@ More detailed requirements are outlined in the [Installing the Islandora Essenti

### Optional Requirements

If you want to support languages other than English download and enable [String Translation](https://drupal.org/project/i18n), and follow our [guide](https://github.com/Islandora/islandora/wiki/Multilingual-Support) for setting up additional languges.
If you want to support languages other than English, download and enable [String Translation](https://drupal.org/project/i18n), and follow our [guide](https://github.com/Islandora/islandora/wiki/Multilingual-Support) for setting up additional languages.

## Installation

Before installing Islandora the XACML policies located [here](https://github.com/Islandora/islandora-xacml-policies) should be copied into the Fedora global XACML policies folder. This will allow "authenticated users" in Drupal to access Fedora API-M functions. It is to be noted that the `permit-upload-to-anonymous-user.xml` and `permit-apim-to-anonymous-user.xml` files do not need to be present unless requirements for anonymous ingesting are present.
This is one Drupal module in a suite of modules (and stack of related software) which are required for Islandora to function correctly. For full installation instructions please see the [documentation in the DuraSpace Wiki](https://wiki.duraspace.org/display/ISLANDORA/Islandora).

You will also have to remove some default policies if you want full functionality as well.
### Global Fedora XACML policies
Before installing Islandora, the XACML policies located [here](https://github.com/Islandora/islandora-xacml-policies) should be copied into the Fedora global XACML policies folder. This will allow "authenticated users" in Drupal to access Fedora API-M functions (create, edit, and delete objects in Fedora).

Remove `deny-purge-datastream-if-active-or-inactive.xml` to allow for purging of datastream versions.
Notes:
* Delete the `permit-upload-to-anonymous-user.xml` and `permit-apim-to-anonymous-user.xml` policies unless you want to allow anonymous (unauthenticated) users to create Islandora objects (not recommended).
* Delete the `deny-purge-datastream-if-active-or-inactive.xml` to allow users to purge (permanently remove) datastream versions.

More detailed information can be found in the 'Set XACML Policies' in the [Installing Fedora](https://wiki.duraspace.org/display/ISLANDORA/milestone+1+-+Installing+Fedora) chapter of the documentation.

### Protecting the 'anonymous' username
The `islandora_drupal_filter` passes the username of 'anonymous' through to Fedora for unauthenticated Drupal Users. A user with the name of 'anonymous' may have XACML policies applied to them that are meant to be applied to Drupal users that are not logged in or vice-versa. This is a potential security issue that can be plugged by creating a user named 'anonymous' and restricting access to the account. If this is done after installing Islandora, Drupal's cron can be run to remove expired authentication tokens.


## Configuration

The `islandora_drupal_filter` passes the username of 'anonymous' through to Fedora for unauthenticated Drupal Users. A user with the name of 'anonymous' may have XACML policies applied to them that are meant to be applied to Drupal users that are not logged in or vice-versa. This is a potential security issue that can be plugged by creating a user named 'anonymous' and restricting access to the account.
Configuration that applies to all solution packs, including the location of the Fedora Repository, the namespaces accessible by this instance of Islandora, and whether to generate derivatives on ingest, are available at `admin/islandora/configure`.

![Configuration](https://user-images.githubusercontent.com/1943338/40320855-724afcba-5d03-11e8-9109-0b8413349839.png)

### Breadcrumb Generation

Drupal's cron can be run to remove expired authentication tokens.
Whether Drupal breadcrumbs (showing an object's parent hierarchy) should be displayed, and how they are generated, can be set on the configuration page. Other modules (such as [Islandora Solr](https://github.com/Islandora/islandora_solr_search)) may provide alternatives that perform better at large scales than the built-in Resource Index query.

**Breadcrumb Generation** on the configuration page, allows you to choose the default breadcrumb generation
or a custom method (if implemented).
### Inactive and Deleted Objects

By default, objects with the [Fedora state](https://wiki.duraspace.org/display/FEDORA38/Fedora+Digital+Object+Model) of "Inactive" or "Deleted" are accessible to all users with the Drupal permission "View repository objects". It is possible to use a separate permission to control access to these non-"Active" objects, but this permission must first be enabled at `admin/islandora/configure`, then the permssion can be granted to desired roles at `admin/people/permissions`.

### Customization

[Customize ingest forms](http://github.com/Islandora/islandora/wiki/Multi-paged-Ingest-Forms)
* Hooks provided by Islandora are documented in `islandora.api.php`.
* A [detailed tutorial](https://github.com/Islandora/islandora/wiki/Multi-paged-Ingest-Forms) on extending the multi-page ingest forms is available on the Github (developers') Wiki.
* Additional modules developed by members of the Islandora community to extend Islandora can be found on the curated [Islandora Awesome](https://github.com/Islandora-Labs/islandora_awesome) list.

## Documentation

Further documentation for this module is available at [our wiki](https://wiki.duraspace.org/display/ISLANDORA/Islandora+Core+Module).
Further documentation for this module is available at [our documentation wiki](https://wiki.duraspace.org/display/ISLANDORA/Islandora+Core+Module).

## Troubleshooting/Issues

NOTE: There has been a function signature change for the `ingestDatastream` function within Tuque which will be deprecated after the 7.x-1.10 release. To read about it in detail please see the [JIRA ticket](https://jira.duraspace.org/browse/ISLANDORA-1995). For the time being there is a warning stating that this will become deprecated and that code that utilizes this specific behavior should be updated. Once this code is updated the `islandora_deprecation_return_false_when_datastream_exists` variable may be set to FALSE so the warning no longer displays. An example for doing this with drush: `drush vset islandora_deprecation_return_false_when_datastream_exists FALSE`.

Having problems or solved a problem? Check out the Islandora google groups for a solution.

* [Islandora Group](https://groups.google.com/forum/?hl=en&fromgroups#!forum/islandora)
Expand All @@ -66,7 +78,8 @@ Having problems or solved a problem? Check out the Islandora google groups for a

Current maintainers:

* [William Panting](https://github.com/willtp87)
* [Diego Pino](https://github.com/DiegoPino)
* [Jonathan Green](https://github.com/jonathangreen)

## Development

Expand All @@ -75,4 +88,3 @@ If you would like to contribute to this module, please check out [CONTRIBUTING.m
## License

[GPLv3](http://www.gnu.org/licenses/gpl-3.0.txt)

105 changes: 0 additions & 105 deletions build.xml

This file was deleted.

Loading