diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 23e8772a6..f10a672d7 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -39,4 +39,3 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Your GoReleaser Pro key, if you are using the 'goreleaser-pro' distribution # GORELEASER_KEY: ${{ secrets.GORELEASER_KEY }} - diff --git a/Makefile b/Makefile index 06c28d321..3a1e64b1e 100644 --- a/Makefile +++ b/Makefile @@ -1,12 +1,12 @@ # # Copyright (C) 2023, Pelican Project, Morgridge Institute for Research -# +# # Licensed under the Apache License, Version 2.0 (the "License"); you # may not use this file except in compliance with the License. You may # obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/cmd/director.go b/cmd/director.go index f56e5cf84..fa53d7b24 100644 --- a/cmd/director.go +++ b/cmd/director.go @@ -28,11 +28,11 @@ var ( Use: "director", Short: "Launch a Pelican Director", Long: `Launch a Pelican Director service: - + The Pelican Director is the primary mechanism by which clients/caches can discover the source of a requested resource. It has two endpoints at /api/v1.0/director/origin/ and /api/v1.0/director/object/, where the - former redirects to the closest origin supporting the object and the + former redirects to the closest origin supporting the object and the latter redirects to the closest cache. As a shortcut, requests to the director at /foo/bar will be treated as a request for the object from cache.`, diff --git a/cmd/namespace_registry.go b/cmd/namespace_registry.go index 169906d53..af1e696ac 100644 --- a/cmd/namespace_registry.go +++ b/cmd/namespace_registry.go @@ -27,16 +27,16 @@ var ( Use: "registry", Short: "Interact with a Pelican namespace registry service", Long: `Interact with a Pelican namespace registry service: - + The namespace registry lies at the core of Pelican's security model by serving as the central point for clients to fetch the public keys associated with namespaced resources. When origins wish to claim a namespace prefix in their federation, they securely associate the public key of their issuer with the namespace registry (many origins - may act as their own issuer). Sometimes origins will provide - additional OIDC metadata if the origins wish to be accessible to the + may act as their own issuer). Sometimes origins will provide + additional OIDC metadata if the origins wish to be accessible to the OSDF's caching infrastructure. Services wishing to validate the - authenticity of a token from an issuer can then reference the + authenticity of a token from an issuer can then reference the namespace registry's listed public key for that origin and verify that it was signed by the correct private key. `, diff --git a/cmd/resources/xrootd.cfg b/cmd/resources/xrootd.cfg index eaeee49d1..2b64515b4 100644 --- a/cmd/resources/xrootd.cfg +++ b/cmd/resources/xrootd.cfg @@ -1,12 +1,12 @@ # # Copyright (C) 2023, Pelican Project, Morgridge Institute for Research -# +# # Licensed under the Apache License, Version 2.0 (the "License"); you # may not use this file except in compliance with the License. You may # obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -26,11 +26,11 @@ xrd.tlsca certdir {{.TLSCertDir}} {{else}} xrd.tlsca certfile {{.TLSCertFile}} {{end}} -http.exthandler xrdmacaroons libXrdMacaroons.so +http.exthandler xrdmacaroons libXrdMacaroons.so macaroons.secretkey {{.MacaroonsKeyFile}} -ofs.authlib ++ libXrdMacaroons.so -http.header2cgi Authorization authz -http.secxtractor /usr/lib64/libXrdVoms.so +ofs.authlib ++ libXrdMacaroons.so +http.header2cgi Authorization authz +http.secxtractor /usr/lib64/libXrdVoms.so http.staticpreload http://static/robots.txt {{.RobotsTxtFile}} {{if .Sitename}} all.sitename {{.Sitename}} @@ -44,19 +44,19 @@ xrootd.monitor all auth flush 30s window 5s fstat 60 lfn ops xfr 5 dest redir fs all.adminpath {{.XrootdRun}} all.pidpath {{.XrootdRun}} oss.localroot {{.Mount}} -xrootd.seclib libXrdSec.so +xrootd.seclib libXrdSec.so sec.protocol ztn -ofs.authorize 1 +ofs.authorize 1 acc.audit deny grant acc.authdb {{.Authfile}} ofs.authlib ++ libXrdAccSciTokens.so config={{.ScitokensConfig}} all.export {{.NamespacePrefix}} {{if .Origin.Multiuser}} -ofs.osslib libXrdMultiuser.so default -ofs.ckslib * libXrdMultiuser.so +ofs.osslib libXrdMultiuser.so default +ofs.ckslib * libXrdMultiuser.so {{end}} -xrootd.chksum max 2 md5 adler32 crc32 -xrootd.trace emsg login stall redirect -pfc.trace info -pss.setopt DebugLevel 1 -xrootd.tls all +xrootd.chksum max 2 md5 adler32 crc32 +xrootd.trace emsg login stall redirect +pfc.trace info +pss.setopt DebugLevel 1 +xrootd.tls all diff --git a/config/resources/defaults.yaml b/config/resources/defaults.yaml index a58d0c59d..a80b1b33b 100644 --- a/config/resources/defaults.yaml +++ b/config/resources/defaults.yaml @@ -1,12 +1,12 @@ # # Copyright (C) 2023, Pelican Project, Morgridge Institute for Research -# +# # Licensed under the Apache License, Version 2.0 (the "License"); you # may not use this file except in compliance with the License. You may # obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/config/resources/osdf.yaml b/config/resources/osdf.yaml index d3540573b..e38c3f0f4 100644 --- a/config/resources/osdf.yaml +++ b/config/resources/osdf.yaml @@ -1,12 +1,12 @@ # # Copyright (C) 2023, Pelican Project, Morgridge Institute for Research -# +# # Licensed under the Apache License, Version 2.0 (the "License"); you # may not use this file except in compliance with the License. You may # obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/docs/parameters.yaml b/docs/parameters.yaml index 7c77c7e2a..5e09211ef 100644 --- a/docs/parameters.yaml +++ b/docs/parameters.yaml @@ -1,12 +1,12 @@ # # Copyright (C) 2023, Pelican Project, Morgridge Institute for Research -# +# # Licensed under the Apache License, Version 2.0 (the "License"); you # may not use this file except in compliance with the License. You may # obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -28,7 +28,7 @@ type: filename --- name: TLSCertificate description: >- - The name of a file containing an X.509 host certificate to use for TLS + The name of a file containing an X.509 host certificate to use for TLS authentication when running server components of Pelican. type: filename root_default: /etc/pelican/certificates/tls.crt diff --git a/images/entrypoint.sh b/images/entrypoint.sh index 7baf81e84..7e7244993 100644 --- a/images/entrypoint.sh +++ b/images/entrypoint.sh @@ -1,13 +1,13 @@ #!/bin/bash # # Copyright (C) 2023, Pelican Project, Morgridge Institute for Research -# +# # Licensed under the Apache License, Version 2.0 (the "License"); you # may not use this file except in compliance with the License. You may # obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -28,5 +28,3 @@ if [ "$1" ]; then else echo "A command must be provided" fi - - diff --git a/images/supervisord/pelican_director_serve.conf b/images/supervisord/pelican_director_serve.conf index 82bacc140..c3d77f557 100644 --- a/images/supervisord/pelican_director_serve.conf +++ b/images/supervisord/pelican_director_serve.conf @@ -1,12 +1,12 @@ # # Copyright (C) 2023, Pelican Project, Morgridge Institute for Research -# +# # Licensed under the Apache License, Version 2.0 (the "License"); you # may not use this file except in compliance with the License. You may # obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -15,7 +15,7 @@ # [program:pelican_director_serve] -command=/pelican/osdf-client director serve -p %(ENV_OSDF_DIRECTOR_PORT)s +command=/pelican/osdf-client director serve -p %(ENV_OSDF_DIRECTOR_PORT)s autostart=false autorestart=true redirect_stderr=true diff --git a/images/supervisord/pelican_registry_serve.conf b/images/supervisord/pelican_registry_serve.conf index ddea9e634..cdf3259d5 100644 --- a/images/supervisord/pelican_registry_serve.conf +++ b/images/supervisord/pelican_registry_serve.conf @@ -1,12 +1,12 @@ # # Copyright (C) 2023, Pelican Project, Morgridge Institute for Research -# +# # Licensed under the Apache License, Version 2.0 (the "License"); you # may not use this file except in compliance with the License. You may # obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -15,7 +15,7 @@ # [program:pelican_registry_serve] -command=/pelican/osdf-client registry serve -p %(ENV_OSDF_REGISTRY_PORT)s +command=/pelican/osdf-client registry serve -p %(ENV_OSDF_REGISTRY_PORT)s autostart=false autorestart=true redirect_stderr=true diff --git a/images/supervisord/supervisord.conf b/images/supervisord/supervisord.conf index 8e3dbab6b..c908f05af 100644 --- a/images/supervisord/supervisord.conf +++ b/images/supervisord/supervisord.conf @@ -1,12 +1,12 @@ # # Copyright (C) 2023, Pelican Project, Morgridge Institute for Research -# +# # Licensed under the Apache License, Version 2.0 (the "License"); you # may not use this file except in compliance with the License. You may # obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -31,4 +31,3 @@ loglevel=debug [include] files=/etc/supervisord.d/*.conf - diff --git a/origin_ui/src/README.md b/origin_ui/src/README.md index d07cf4ff4..924c0f424 100644 --- a/origin_ui/src/README.md +++ b/origin_ui/src/README.md @@ -1,6 +1,6 @@ # Origin UI -This ui is generated with Next.js. +This ui is generated with Next.js. ## Development @@ -12,4 +12,4 @@ docker build -t origin-ui . docker run -it -p 3000:3000 -v $(pwd):/webapp origin-ui npm run dev ``` -You can also run if you have node installed locally via `npm install && npm run dev`. \ No newline at end of file +You can also run if you have node installed locally via `npm install && npm run dev`. diff --git a/origin_ui/src/app/initialization/code/CodeInput.tsx b/origin_ui/src/app/initialization/code/CodeInput.tsx index 77702b78c..a66acf0d2 100644 --- a/origin_ui/src/app/initialization/code/CodeInput.tsx +++ b/origin_ui/src/app/initialization/code/CodeInput.tsx @@ -159,4 +159,4 @@ export default function CodeInput({length, setCode, submitFunction}: CodeInputPr ) -} \ No newline at end of file +} diff --git a/origin_ui/src/app/initialization/code/LoadingButton.tsx b/origin_ui/src/app/initialization/code/LoadingButton.tsx index 31449ab31..7cfb1880f 100644 --- a/origin_ui/src/app/initialization/code/LoadingButton.tsx +++ b/origin_ui/src/app/initialization/code/LoadingButton.tsx @@ -48,4 +48,4 @@ export default function LoadingButton({loading, ...props}: LoadingButtonProps) { {loading ? : props.children } ) -} \ No newline at end of file +} diff --git a/origin_ui/src/app/initialization/password/PasswordInput.tsx b/origin_ui/src/app/initialization/password/PasswordInput.tsx index 6c2d8e834..30a0d04f2 100644 --- a/origin_ui/src/app/initialization/password/PasswordInput.tsx +++ b/origin_ui/src/app/initialization/password/PasswordInput.tsx @@ -70,4 +70,4 @@ export default function PasswordInput({FormControlProps, TextFieldProps}: Passwo /> ) -} \ No newline at end of file +} diff --git a/origin_ui/src/app/initialization/password/page.tsx b/origin_ui/src/app/initialization/password/page.tsx index 33a87e777..1a086adf3 100644 --- a/origin_ui/src/app/initialization/password/page.tsx +++ b/origin_ui/src/app/initialization/password/page.tsx @@ -113,4 +113,4 @@ export default function Home() { ) -} \ No newline at end of file +} diff --git a/origin_ui/src/app/page.module.css b/origin_ui/src/app/page.module.css index 4cd2210b3..257645ffc 100644 --- a/origin_ui/src/app/page.module.css +++ b/origin_ui/src/app/page.module.css @@ -270,4 +270,3 @@ transform: rotate(0deg); } } - diff --git a/origin_ui/src/components/layout/Header.tsx b/origin_ui/src/components/layout/Header.tsx index da0a561fb..505829518 100644 --- a/origin_ui/src/components/layout/Header.tsx +++ b/origin_ui/src/components/layout/Header.tsx @@ -61,4 +61,4 @@ export const Header = () => { ) -} \ No newline at end of file +} diff --git a/origin_ui/src/components/progress-pager.tsx b/origin_ui/src/components/progress-pager.tsx index a80fff889..ac2731766 100644 --- a/origin_ui/src/components/progress-pager.tsx +++ b/origin_ui/src/components/progress-pager.tsx @@ -53,4 +53,4 @@ export default function ProgressPager({steps, activeStep}: ProgressPagerProps) { } ) -} \ No newline at end of file +} diff --git a/origin_ui/src/public/next.svg b/origin_ui/src/public/next.svg index 5174b28c5..5bb00d403 100644 --- a/origin_ui/src/public/next.svg +++ b/origin_ui/src/public/next.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/origin_ui/src/public/theme.tsx b/origin_ui/src/public/theme.tsx index f9c00e24f..6c293045c 100644 --- a/origin_ui/src/public/theme.tsx +++ b/origin_ui/src/public/theme.tsx @@ -82,4 +82,4 @@ interface ThemeProviderClientProps { export const ThemeProviderClient: FC = ({children}) => { return {children} -} \ No newline at end of file +} diff --git a/origin_ui/src/public/vercel.svg b/origin_ui/src/public/vercel.svg index d2f842227..1aeda7d6d 100644 --- a/origin_ui/src/public/vercel.svg +++ b/origin_ui/src/public/vercel.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/resources/10-stash-plugin.conf b/resources/10-stash-plugin.conf index 4692e2912..b7ffbb63c 100644 --- a/resources/10-stash-plugin.conf +++ b/resources/10-stash-plugin.conf @@ -1,12 +1,12 @@ # # Copyright (C) 2023, Pelican Project, Morgridge Institute for Research -# +# # Licensed under the Apache License, Version 2.0 (the "License"); you # may not use this file except in compliance with the License. You may # obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/resources/opensciencegrid.org.pub b/resources/opensciencegrid.org.pub index 3fbbbd12c..44c490336 100644 --- a/resources/opensciencegrid.org.pub +++ b/resources/opensciencegrid.org.pub @@ -7,4 +7,3 @@ Dy3YQXwmEPm7kAZwIsEbMa0PNkp85IDkdR1GpvRvDMCRmUaRHrQUPBwPIjs0akL+ qoTxJs9k6quV0g3Wd8z65s/k5mEZ+AnHHI0+0CL3y80wnuLSBYmw05YBtKyoa1Fb FQIDAQAB -----END PUBLIC KEY----- - diff --git a/resources/update-namespaces.sh b/resources/update-namespaces.sh index 3873fd41e..484ed5d72 100755 --- a/resources/update-namespaces.sh +++ b/resources/update-namespaces.sh @@ -1,13 +1,13 @@ #!/bin/bash # # Copyright (C) 2023, Pelican Project, University of Wisconsin-Madison -# +# # Licensed under the Apache License, Version 2.0 (the "License"); you # may not use this file except in compliance with the License. You may # obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -46,4 +46,3 @@ jq --sort-keys . namespaces.json.raw > namespaces.json.formatted || mv -f namespaces.json.formatted namespaces.json || fail $? "Move failed" rm -f namespaces.json.raw - diff --git a/tests/citests.sh b/tests/citests.sh index f5ca9b7d9..6fd38eb55 100755 --- a/tests/citests.sh +++ b/tests/citests.sh @@ -1,13 +1,13 @@ #!/bin/bash -xe # # Copyright (C) 2023, University of Nebraska-Lincoln -# +# # Licensed under the Apache License, Version 2.0 (the "License"); you # may not use this file except in compliance with the License. You may # obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.