You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ma...@apache.org on 2017/05/12 14:27:07 UTC
[1/6] airavata-php-gateway git commit: Update data store id when
cloning in the case that the id changed
Repository: airavata-php-gateway
Updated Branches:
refs/heads/develop 863534ba2 -> 753a34018
Update data store id when cloning in the case that the id changed
Project: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/commit/975cfa64
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/975cfa64
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/975cfa64
Branch: refs/heads/develop
Commit: 975cfa64a9c380e992a5c4f1ad7e10d1021dd7eb
Parents: 863534b
Author: Marcus Christie <ma...@iu.edu>
Authored: Fri Apr 7 15:22:55 2017 -0400
Committer: Marcus Christie <ma...@iu.edu>
Committed: Fri Apr 7 15:22:55 2017 -0400
----------------------------------------------------------------------
app/libraries/ExperimentUtilities.php | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/975cfa64/app/libraries/ExperimentUtilities.php
----------------------------------------------------------------------
diff --git a/app/libraries/ExperimentUtilities.php b/app/libraries/ExperimentUtilities.php
index 2202218..447cd7a 100755
--- a/app/libraries/ExperimentUtilities.php
+++ b/app/libraries/ExperimentUtilities.php
@@ -691,6 +691,9 @@ class ExperimentUtilities
$userHasComputeResourcePreference = array_key_exists($computeResourceId, $userComputeResourcePreferences);
$experiment->userConfigurationData->useUserCRPref = $userHasComputeResourcePreference;
}
+ // In case the gateway-data-store-resource-id has changed since the
+ // original experiment was created, update in this experiment
+ $experiment->userConfigurationData->storageId = Config::get('pga_config.airavata')['gateway-data-store-resource-id'];
Airavata::updateExperiment(Session::get('authz-token'), $cloneId, $experiment);
$share = SharingUtilities::getAllUserPermissions($expId, ResourceType::EXPERIMENT);
[5/6] airavata-php-gateway git commit: Updating IDP certs with new
SSL Certs
Posted by ma...@apache.org.
Updating IDP certs with new SSL Certs
Project: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/commit/eebf5315
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/eebf5315
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/eebf5315
Branch: refs/heads/develop
Commit: eebf53151e13589f5df9b4a1d3381ee4b22555fc
Parents: 5d1d82c
Author: Suresh Marru <sm...@apache.org>
Authored: Mon May 1 13:09:02 2017 -0400
Committer: Suresh Marru <sm...@apache.org>
Committed: Mon May 1 13:09:02 2017 -0400
----------------------------------------------------------------------
app/resources/security/idp_scigap_org.pem | 156 ++++++++++++++++---------
1 file changed, 98 insertions(+), 58 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/eebf5315/app/resources/security/idp_scigap_org.pem
----------------------------------------------------------------------
diff --git a/app/resources/security/idp_scigap_org.pem b/app/resources/security/idp_scigap_org.pem
index 6cb8cf3..129dd69 100755
--- a/app/resources/security/idp_scigap_org.pem
+++ b/app/resources/security/idp_scigap_org.pem
@@ -1,4 +1,102 @@
-----BEGIN CERTIFICATE-----
+MIIFgDCCBGigAwIBAgIRANnsHhWk13Srp3dmaRM+sxkwDQYJKoZIhvcNAQELBQAw
+djELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAk1JMRIwEAYDVQQHEwlBbm4gQXJib3Ix
+EjAQBgNVBAoTCUludGVybmV0MjERMA8GA1UECxMISW5Db21tb24xHzAdBgNVBAMT
+FkluQ29tbW9uIFJTQSBTZXJ2ZXIgQ0EwHhcNMTcwNTAxMDAwMDAwWhcNMjAwNDMw
+MjM1OTU5WjCBujELMAkGA1UEBhMCVVMxDjAMBgNVBBETBTQ3NDA1MQswCQYDVQQI
+EwJJTjEUMBIGA1UEBxMLQmxvb21pbmd0b24xFzAVBgNVBAkTDjkwMCBFLiA3dGgg
+U3QuMRswGQYDVQQKExJJbmRpYW5hIFVuaXZlcnNpdHkxKTAnBgNVBAsTIFNjaWVu
+Y2UgR2F0ZXdheXMgUmVzZWFyY2ggQ2VudGVyMRcwFQYDVQQDEw5pZHAuc2NpZ2Fw
+Lm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN08CZh5TWg1AAF3
+cZ3HJk1raw1z2K2CCLx4KPCmaLLs2tSIMzfm4u3o34WgXaC0rcI5WhY6aSXyh99m
+kGNMcsaiSSYcWuv6E1C8vGi8K7DmhE+bJ8h/+JMLCXO/0Rh0cO/yG9wdqJPt197i
+aJMNa9CFGl0EPT7Mgc+8WZNI/xYfocBAnafcVW2c/kZZW6eefmn/zXSUyLOx/406
+m7lzDerWj7OnYD83CsJSKIDruW1RNC2PkHnjATZQxYLTL+t+INlhtjTg8UesCQ+5
+S5e/PJ0iY4xsPfqAsnDBe+chGXlSsqU6QA34zkpbOwyAvQtQCxtLdIT7FpoC6ybs
+v5uLFcECAwEAAaOCAcIwggG+MB8GA1UdIwQYMBaAFB4Fo3ePbJbiW4dLprSGrHEA
+DOc4MB0GA1UdDgQWBBTYvXgghQKFR7dOYMjWQ2xdr2NRozAOBgNVHQ8BAf8EBAMC
+BaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIw
+ZwYDVR0gBGAwXjBSBgwrBgEEAa4jAQQDAQEwQjBABggrBgEFBQcCARY0aHR0cHM6
+Ly93d3cuaW5jb21tb24ub3JnL2NlcnQvcmVwb3NpdG9yeS9jcHNfc3NsLnBkZjAI
+BgZngQwBAgIwRAYDVR0fBD0wOzA5oDegNYYzaHR0cDovL2NybC5pbmNvbW1vbi1y
+c2Eub3JnL0luQ29tbW9uUlNBU2VydmVyQ0EuY3JsMHUGCCsGAQUFBwEBBGkwZzA+
+BggrBgEFBQcwAoYyaHR0cDovL2NydC51c2VydHJ1c3QuY29tL0luQ29tbW9uUlNB
+U2VydmVyQ0FfMi5jcnQwJQYIKwYBBQUHMAGGGWh0dHA6Ly9vY3NwLnVzZXJ0cnVz
+dC5jb20wGQYDVR0RBBIwEIIOaWRwLnNjaWdhcC5vcmcwDQYJKoZIhvcNAQELBQAD
+ggEBADWRJkrErljfyIqZC3AZSEkhvsdePJE1vl9k2u0anYLixDMq1I5xfHdu2/WY
+2MSaJNoaQuIQ5hbxb0OoQsXuaA8LCAB+CFaIqEfLNEJ4VaeMGoK+8A2Up3iJN4ZS
+6F20wZW+eeOyJ26y8rwXEpdBJlFXdy3EgrWA1sxXBLBzM/DhMhFxDUpGTDnPECJy
+wTZFbSYppERRfF9iq6BzHecSoJjq9r8MAsg4CDsqwcjgGlHQoF08YkEMe4ygUuFU
+J/wMi09+NV78K7ci/N9oCPcUhj1lkYU94Em9q4YsOrA9DVDGB+d94qlzFBdCrsGg
+eais/kkrKKtoWC5ZSCqtyUpPKeo=
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIF+TCCA+GgAwIBAgIQRyDQ+oVGGn4XoWQCkYRjdDANBgkqhkiG9w0BAQwFADCB
+iDELMAkGA1UEBhMCVVMxEzARBgNVBAgTCk5ldyBKZXJzZXkxFDASBgNVBAcTC0pl
+cnNleSBDaXR5MR4wHAYDVQQKExVUaGUgVVNFUlRSVVNUIE5ldHdvcmsxLjAsBgNV
+BAMTJVVTRVJUcnVzdCBSU0EgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMTQx
+MDA2MDAwMDAwWhcNMjQxMDA1MjM1OTU5WjB2MQswCQYDVQQGEwJVUzELMAkGA1UE
+CBMCTUkxEjAQBgNVBAcTCUFubiBBcmJvcjESMBAGA1UEChMJSW50ZXJuZXQyMREw
+DwYDVQQLEwhJbkNvbW1vbjEfMB0GA1UEAxMWSW5Db21tb24gUlNBIFNlcnZlciBD
+QTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJwb8bsvf2MYFVFRVA+e
+xU5NEFj6MJsXKZDmMwysE1N8VJG06thum4ltuzM+j9INpun5uukNDBqeso7JcC7v
+HgV9lestjaKpTbOc5/MZNrun8XzmCB5hJ0R6lvSoNNviQsil2zfVtefkQnI/tBPP
+iwckRR6MkYNGuQmm/BijBgLsNI0yZpUn6uGX6Ns1oytW61fo8BBZ321wDGZq0GTl
+qKOYMa0dYtX6kuOaQ80tNfvZnjNbRX3EhigsZhLI2w8ZMA0/6fDqSl5AB8f2IHpT
+eIFken5FahZv9JNYyWL7KSd9oX8hzudPR9aKVuDjZvjs3YncJowZaDuNi+L7RyML
+fzcCAwEAAaOCAW4wggFqMB8GA1UdIwQYMBaAFFN5v1qqK0rPVIDh2JvAnfKyA2bL
+MB0GA1UdDgQWBBQeBaN3j2yW4luHS6a0hqxxAAznODAOBgNVHQ8BAf8EBAMCAYYw
+EgYDVR0TAQH/BAgwBgEB/wIBADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUH
+AwIwGwYDVR0gBBQwEjAGBgRVHSAAMAgGBmeBDAECAjBQBgNVHR8ESTBHMEWgQ6BB
+hj9odHRwOi8vY3JsLnVzZXJ0cnVzdC5jb20vVVNFUlRydXN0UlNBQ2VydGlmaWNh
+dGlvbkF1dGhvcml0eS5jcmwwdgYIKwYBBQUHAQEEajBoMD8GCCsGAQUFBzAChjNo
+dHRwOi8vY3J0LnVzZXJ0cnVzdC5jb20vVVNFUlRydXN0UlNBQWRkVHJ1c3RDQS5j
+cnQwJQYIKwYBBQUHMAGGGWh0dHA6Ly9vY3NwLnVzZXJ0cnVzdC5jb20wDQYJKoZI
+hvcNAQEMBQADggIBAC0RBjjW29dYaK+qOGcXjeIT16MUJNkGE+vrkS/fT2ctyNMU
+11ZlUp5uH5gIjppIG8GLWZqjV5vbhvhZQPwZsHURKsISNrqOcooGTie3jVgU0W+0
++Wj8mN2knCVANt69F2YrA394gbGAdJ5fOrQmL2pIhDY0jqco74fzYefbZ/VS29fR
+5jBxu4uj1P+5ZImem4Gbj1e4ZEzVBhmO55GFfBjRidj26h1oFBHZ7heDH1Bjzw72
+hipu47Gkyfr2NEx3KoCGMLCj3Btx7ASn5Ji8FoU+hCazwOU1VX55mKPU1I2250Lo
+RCASN18JyfsD5PVldJbtyrmz9gn/TKbRXTr80U2q5JhyvjhLf4lOJo/UzL5WCXED
+Smyj4jWG3R7Z8TED9xNNCxGBMXnMete+3PvzdhssvbORDwBZByogQ9xL2LUZFI/i
+eoQp0UM/L8zfP527vWjEzuDN5xwxMnhi+vCToh7J159o5ah29mP+aJnvujbXEnGa
+nrNxHzu+AGOePV8hwrGGG7hOIcPDQwkuYwzN/xT29iLp/cqf9ZhEtkGcQcIImH3b
+oJ8ifsCnSbu0GB9L06Yqh7lcyvKDTEADslIaeSEINxhO2Y1fmcYFX/Fqrrp1WnhH
+OjplXuXE0OPa0utaKC25Aplgom88L2Z8mEWcyfoB7zKOfD759AN7JKZWCYwk
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIFdzCCBF+gAwIBAgIQE+oocFv07O0MNmMJgGFDNjANBgkqhkiG9w0BAQwFADBv
+MQswCQYDVQQGEwJTRTEUMBIGA1UEChMLQWRkVHJ1c3QgQUIxJjAkBgNVBAsTHUFk
+ZFRydXN0IEV4dGVybmFsIFRUUCBOZXR3b3JrMSIwIAYDVQQDExlBZGRUcnVzdCBF
+eHRlcm5hbCBDQSBSb290MB4XDTAwMDUzMDEwNDgzOFoXDTIwMDUzMDEwNDgzOFow
+gYgxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpOZXcgSmVyc2V5MRQwEgYDVQQHEwtK
+ZXJzZXkgQ2l0eTEeMBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMS4wLAYD
+VQQDEyVVU0VSVHJ1c3QgUlNBIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIICIjAN
+BgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAgBJlFzYOw9sIs9CsVw127c0n00yt
+UINh4qogTQktZAnczomfzD2p7PbPwdzx07HWezcoEStH2jnGvDoZtF+mvX2do2NC
+tnbyqTsrkfjib9DsFiCQCT7i6HTJGLSR1GJk23+jBvGIGGqQIjy8/hPwhxR79uQf
+jtTkUcYRZ0YIUcuGFFQ/vDP+fmyc/xadGL1RjjWmp2bIcmfbIWax1Jt4A8BQOujM
+8Ny8nkz+rwWWNR9XWrf/zvk9tyy29lTdyOcSOk2uTIq3XJq0tyA9yn8iNK5+O2hm
+AUTnAU5GU5szYPeUvlM3kHND8zLDU+/bqv50TmnHa4xgk97Exwzf4TKuzJM7UXiV
+Z4vuPVb+DNBpDxsP8yUmazNt925H+nND5X4OpWaxKXwyhGNVicQNwZNUMBkTrNN9
+N6frXTpsNVzbQdcS2qlJC9/YgIoJk2KOtWbPJYjNhLixP6Q5D9kCnusSTJV882sF
+qV4Wg8y4Z+LoE53MW4LTTLPtW//e5XOsIzstAL81VXQJSdhJWBp/kjbmUZIO8yZ9
+HE0XvMnsQybQv0FfQKlERPSZ51eHnlAfV1SoPv10Yy+xUGUJ5lhCLkMaTLTwJUdZ
++gQek9QmRkpQgbLevni3/GcV4clXhB4PY9bpYrrWX1Uu6lzGKAgEJTm4Diup8kyX
+HAc/DVL17e8vgg8CAwEAAaOB9DCB8TAfBgNVHSMEGDAWgBStvZh6NLQm9/rEJlTv
+A73gJMtUGjAdBgNVHQ4EFgQUU3m/WqorSs9UgOHYm8Cd8rIDZsswDgYDVR0PAQH/
+BAQDAgGGMA8GA1UdEwEB/wQFMAMBAf8wEQYDVR0gBAowCDAGBgRVHSAAMEQGA1Ud
+HwQ9MDswOaA3oDWGM2h0dHA6Ly9jcmwudXNlcnRydXN0LmNvbS9BZGRUcnVzdEV4
+dGVybmFsQ0FSb290LmNybDA1BggrBgEFBQcBAQQpMCcwJQYIKwYBBQUHMAGGGWh0
+dHA6Ly9vY3NwLnVzZXJ0cnVzdC5jb20wDQYJKoZIhvcNAQEMBQADggEBAJNl9jeD
+lQ9ew4IcH9Z35zyKwKoJ8OkLJvHgwmp1ocd5yblSYMgpEg7wrQPWCcR23+WmgZWn
+RtqCV6mVksW2jwMibDN3wXsyF24HzloUQToFJBv2FAY7qCUkDrvMKnXduXBBP3zQ
+YzYhBx9G/2CkkeFnvN4ffhkUyWNnkepnB2u0j4vAbkN9w6GAbLIevFOFfdyQoaS8
+Le9Gclc1Bb+7RrtubTeZtv8jkpHGbkD4jylW6l/VXxRTrPBPYer3IsynVgviuDQf
+Jtl7GQVoP7o81DgGotPmjw7jtHFtQELFhLRAlSv0ZaBIefYdgWOWnU914Ph85I6p
+0fKtirOMxyHNwu8=
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
MIIENjCCAx6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBvMQswCQYDVQQGEwJTRTEU
MBIGA1UEChMLQWRkVHJ1c3QgQUIxJjAkBgNVBAsTHUFkZFRydXN0IEV4dGVybmFs
IFRUUCBOZXR3b3JrMSIwIAYDVQQDExlBZGRUcnVzdCBFeHRlcm5hbCBDQSBSb290
@@ -22,62 +120,4 @@ YINRsPkyPef89iYTx4AWpb9a/IfPeHmJIZriTAcKhjW88t5RxNKWt9x+Tu5w/Rw5
Nr4TDea9Y355e6cJDUCrat2PisP29owaQgVR1EX1n6diIWgVIEM8med8vSTYqZEX
c4g/VhsxOBi0cQ+azcgOno4uG+GMmIPLHzHxREzGBHNJdmAPx/i9F4BrLunMTA5a
mnkPIAou1Z5jJh5VkpTYghdae9C8x49OhgQ=
------END CERTIFICATE-----
------BEGIN CERTIFICATE-----
-MIIEwzCCA6ugAwIBAgIQf3HB06ImsNKxE/PmgWdkPjANBgkqhkiG9w0BAQUFADBv
-MQswCQYDVQQGEwJTRTEUMBIGA1UEChMLQWRkVHJ1c3QgQUIxJjAkBgNVBAsTHUFk
-ZFRydXN0IEV4dGVybmFsIFRUUCBOZXR3b3JrMSIwIAYDVQQDExlBZGRUcnVzdCBF
-eHRlcm5hbCBDQSBSb290MB4XDTEwMTIwNzAwMDAwMFoXDTIwMDUzMDEwNDgzOFow
-UTELMAkGA1UEBhMCVVMxEjAQBgNVBAoTCUludGVybmV0MjERMA8GA1UECxMISW5D
-b21tb24xGzAZBgNVBAMTEkluQ29tbW9uIFNlcnZlciBDQTCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAJd8x8j+s+kgaqOkT46ONFYGs3psqhCbSGErNpBp
-4zQKR6e7e96qavvrgpWPyh1/r3WmqEzaIGdhGg2GwcrBh6+sTuTeYhsvnbGYr8YB
-+xdw26wUWexvPzN/ppgL5OI4r/V/hW0OdASd9ieGx5uP53EqCPQDAkBjJH1AV49U
-4FR+thNIYfHezg69tvpNmLLZDY15puCqzQyRmqXfq3O7yhR4XEcpocrFup/H2mD3
-/+d/8tnaoS0PSRan0wCSz4pH2U341ZVm03T5gGMAT0yEFh+z9SQfoU7e6JXWsgsJ
-iyxrx1wvjGPJmctSsWJ7cwFif2Ns2Gig7mqojR8p89AYrK0CAwEAAaOCAXcwggFz
-MB8GA1UdIwQYMBaAFK29mHo0tCb3+sQmVO8DveAky1QaMB0GA1UdDgQWBBRIT1r6
-L0qaXuBQ82t7VaXe9b40XTAOBgNVHQ8BAf8EBAMCAQYwEgYDVR0TAQH/BAgwBgEB
-/wIBADARBgNVHSAECjAIMAYGBFUdIAAwRAYDVR0fBD0wOzA5oDegNYYzaHR0cDov
-L2NybC51c2VydHJ1c3QuY29tL0FkZFRydXN0RXh0ZXJuYWxDQVJvb3QuY3JsMIGz
-BggrBgEFBQcBAQSBpjCBozA/BggrBgEFBQcwAoYzaHR0cDovL2NydC51c2VydHJ1
-c3QuY29tL0FkZFRydXN0RXh0ZXJuYWxDQVJvb3QucDdjMDkGCCsGAQUFBzAChi1o
-dHRwOi8vY3J0LnVzZXJ0cnVzdC5jb20vQWRkVHJ1c3RVVE5TR0NDQS5jcnQwJQYI
-KwYBBQUHMAGGGWh0dHA6Ly9vY3NwLnVzZXJ0cnVzdC5jb20wDQYJKoZIhvcNAQEF
-BQADggEBAJNmIYB0RYVLwqvOMrAp/t3f1iRbvwNqb1A+DhuzDYijW+7EpBI7Vu8G
-f89/IZVWO0Ex/uGqk9KV85UNPEerylwmrT7x+Yw0bhG+9GfjAkn5pnx7ZCXdF0by
-UOPjCiE6SSTNxoRlaGdosEUtR5nNnKuGKRFy3NacNkN089SXnlag/l9AWNLV1358
-xY4asgRckmYOha0uBs7Io9jrFCeR3s8XMIFTtmYSrTfk9e+WXCAONumsYn0ZgYr1
-kGGmSavOPN/mymTugmU5RZUWukEGAJi6DFZh5MbGhgHPZqkiKQLWPc/EKo2Z3vsJ
-FJ4O0dXG14HdrSSrrAcF4h1ow3BmX9M=
------END CERTIFICATE-----
------BEGIN CERTIFICATE-----
-MIIFFTCCA/2gAwIBAgIQEUBLlISAS3rT/GaBSZxRUTANBgkqhkiG9w0BAQUFADBR
-MQswCQYDVQQGEwJVUzESMBAGA1UEChMJSW50ZXJuZXQyMREwDwYDVQQLEwhJbkNv
-bW1vbjEbMBkGA1UEAxMSSW5Db21tb24gU2VydmVyIENBMB4XDTE0MDUwMTAwMDAw
-MFoXDTE3MDQzMDIzNTk1OVowgYIxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJJTjEU
-MBIGA1UEBxMLQmxvb21pbmd0b24xGzAZBgNVBAoTEkluZGlhbmEgVW5pdmVyc2l0
-eTEaMBgGA1UECxMRSWRlbnRpdHkgUHJvdmlkZXIxFzAVBgNVBAMTDmlkcC5zY2ln
-YXAub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4dFhVixu23vB
-dpTR31H4DWB+PObD2yV0R0eRq8iBVKkvtu4HRt1ClBjZnmfpK1K1pfsO8CSLNjEu
-8ZA7AnynalMjN9DMzWjlYzoezc8vC5RIhGT7n7UAIBmHXXXUuNEr99/BB0rWvWa0
-BlBPZ+JmNn6rO1n4m8RK+Uf06GJogHRmWy3AakNdBT3s3H/LeFHDi5hifw7hbwbs
-dtsSrx56vmEsR9nde2i/ZyDkXWoNifsqkJfWQnKe2KSraS1CxTDzvOS8CAjjK2XD
-TYuD3wjDAr/GCafmId734erKPpSboj1S+0SAceZdnPi4jNBrycXcB2AfCudwse7L
-UhzWlyKy2wIDAQABo4IBtTCCAbEwHwYDVR0jBBgwFoAUSE9a+i9Kml7gUPNre1Wl
-3vW+NF0wHQYDVR0OBBYEFOgRhFYc+6zhi6WLx7+ZPsUr0osVMA4GA1UdDwEB/wQE
-AwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcD
-AjBnBgNVHSAEYDBeMFIGDCsGAQQBriMBBAMBATBCMEAGCCsGAQUFBwIBFjRodHRw
-czovL3d3dy5pbmNvbW1vbi5vcmcvY2VydC9yZXBvc2l0b3J5L2Nwc19zc2wucGRm
-MAgGBmeBDAECAjA9BgNVHR8ENjA0MDKgMKAuhixodHRwOi8vY3JsLmluY29tbW9u
-Lm9yZy9JbkNvbW1vblNlcnZlckNBLmNybDBvBggrBgEFBQcBAQRjMGEwOQYIKwYB
-BQUHMAKGLWh0dHA6Ly9jZXJ0LmluY29tbW9uLm9yZy9JbkNvbW1vblNlcnZlckNB
-LmNydDAkBggrBgEFBQcwAYYYaHR0cDovL29jc3AuaW5jb21tb24ub3JnMBkGA1Ud
-EQQSMBCCDmlkcC5zY2lnYXAub3JnMA0GCSqGSIb3DQEBBQUAA4IBAQAdg9Cv2Ora
-un7CAt77dhfGirTUdytoTwb5d7//OzWz6M95vr3e0siRowrKXq5AnQLY8CZ+YE3H
-yDxlvulWM2cMbubPsOLExCI4sNllViPWFNQKDl6s3Cbc7E2q11Hz048OVU4KtmL5
-5jA6/rWRCvoMepDzMF4T72DCeMnFSe3ICq+kBRI+RmOPoWWjIrL8Q9rWfUVLdQbu
-LgKtSfPpm0VfedZLlrJ3R7urdqpnIESzkBFj5rNDaD7Wiwc0LqcpbpGNo9SZ6IiT
-kKYLJCeoyWMAQa5zo5nnRbJ5cu1z/B50uibxbYclRWKEamiTThEYH824G0jaGCXx
-IspTV/Gt1tKM
-----END CERTIFICATE-----
\ No newline at end of file
[6/6] airavata-php-gateway git commit: AIRAVATA-2324 allow longer
acronyms, shorter admin usernames
Posted by ma...@apache.org.
AIRAVATA-2324 allow longer acronyms, shorter admin usernames
Also require that acronyms contain only alphabetic characters, no
spaces.
Project: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/commit/753a3401
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/753a3401
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/753a3401
Branch: refs/heads/develop
Commit: 753a3401877a0f4e08eed9cf8f67cfdb84a00c09
Parents: eebf531
Author: Marcus Christie <ma...@iu.edu>
Authored: Fri May 12 10:17:22 2017 -0400
Committer: Marcus Christie <ma...@iu.edu>
Committed: Fri May 12 10:19:22 2017 -0400
----------------------------------------------------------------------
app/controllers/AdminController.php | 2 +-
app/views/account/dashboard.blade.php | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/753a3401/app/controllers/AdminController.php
----------------------------------------------------------------------
diff --git a/app/controllers/AdminController.php b/app/controllers/AdminController.php
index 6dd27bd..0153c62 100644
--- a/app/controllers/AdminController.php
+++ b/app/controllers/AdminController.php
@@ -460,7 +460,7 @@ class AdminController extends BaseController {
$inputs = Input::all();
$rules = array(
- "username" => "required|min:6",
+ "username" => "required",
"password" => "required|min:6|max:48|regex:/^.*(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])(?=.*[@!$#*]).*$/",
"confirm_password" => "required|same:password",
"email" => "required|email",
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/753a3401/app/views/account/dashboard.blade.php
----------------------------------------------------------------------
diff --git a/app/views/account/dashboard.blade.php b/app/views/account/dashboard.blade.php
index d59f78f..0899960 100644
--- a/app/views/account/dashboard.blade.php
+++ b/app/views/account/dashboard.blade.php
@@ -113,7 +113,8 @@
</div>
<div class="form-group required">
<label class="control-label">Gateway Acronym </label>
- <input type="text" name="gateway-acronym" class="gateway-acronym form-control" required="required" value="{{Input::old('gateway-acronym') }}" maxlength="6" data-toggle="popover" data-placement="left" data-content="Acronym cannot contain digits or special characters."/>
+ <input type="text" name="gateway-acronym" class="gateway-acronym form-control" required="required" value="{{Input::old('gateway-acronym') }}"
+ pattern="[A-Za-z]+" data-toggle="popover" data-placement="left" data-content="Acronym cannot contain digits or special characters or spaces."/>
</div>
<div class="form-group required">
[4/6] airavata-php-gateway git commit: Only set sharing on default
project when sharing enabled
Posted by ma...@apache.org.
Only set sharing on default project when sharing enabled
Project: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/commit/5d1d82c7
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/5d1d82c7
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/5d1d82c7
Branch: refs/heads/develop
Commit: 5d1d82c7af393f2da51672a6d96779e245f21467
Parents: 69dba34
Author: Marcus Christie <ma...@iu.edu>
Authored: Thu Apr 27 15:36:04 2017 -0400
Committer: Marcus Christie <ma...@iu.edu>
Committed: Thu Apr 27 15:36:59 2017 -0400
----------------------------------------------------------------------
app/libraries/ProjectUtilities.php | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/5d1d82c7/app/libraries/ProjectUtilities.php
----------------------------------------------------------------------
diff --git a/app/libraries/ProjectUtilities.php b/app/libraries/ProjectUtilities.php
index b7f7dd9..3367d16 100755
--- a/app/libraries/ProjectUtilities.php
+++ b/app/libraries/ProjectUtilities.php
@@ -180,11 +180,13 @@ class ProjectUtilities
try {
$projectId = Airavata::createProject(Session::get('authz-token'), Config::get('pga_config.airavata')['gateway-id'], $project);
- $share = new stdClass();
- $share->{$username} = new stdClass();
- $share->{$username}->read = true;
- $share->{$username}->write = true;
- ProjectUtilities::share_project($projectId, $share);
+ if (Config::get('pga_config.airavata')["data-sharing-enabled"]){
+ $share = new stdClass();
+ $share->{$username} = new stdClass();
+ $share->{$username}->read = true;
+ $share->{$username}->write = true;
+ ProjectUtilities::share_project($projectId, $share);
+ }
} catch (InvalidRequestException $ire) {
CommonUtilities::print_error_message('InvalidRequestException!<br><br>' . $ire->getMessage());
[3/6] airavata-php-gateway git commit: AIRAVATA-2370 restoring
gateway request routes
Posted by ma...@apache.org.
AIRAVATA-2370 restoring gateway request routes
Looks like these were unintentionally removed during the develop->master
merge.
Project: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/commit/69dba346
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/69dba346
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/69dba346
Branch: refs/heads/develop
Commit: 69dba346f01bd356fbad1dc4b603c02ff4d136bc
Parents: f06927d
Author: Marcus Christie <ma...@iu.edu>
Authored: Wed Apr 19 13:04:23 2017 -0400
Committer: Marcus Christie <ma...@iu.edu>
Committed: Wed Apr 19 13:04:23 2017 -0400
----------------------------------------------------------------------
app/routes.php | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/69dba346/app/routes.php
----------------------------------------------------------------------
diff --git a/app/routes.php b/app/routes.php
index 7c86629..1408b98 100755
--- a/app/routes.php
+++ b/app/routes.php
@@ -347,6 +347,8 @@ Route::post("admin/create-pwd-token", "AdminController@createPWD");
Route::post("admin/remove-pwd-token", "AdminController@removePWD");
+//GatewayProviders
+Route::get("provider/request-gateway", "AdminController@requestGateway");
//notices
Route::get("admin/dashboard/notices", "AdminController@noticesView");
@@ -364,6 +366,8 @@ Route::post("notice-seen-ack", "AccountController@noticeSeenAck");
Route::post("admin/add-gateway", "AdminController@addGateway");
Route::get("admin/add-gateway", "AdminController@addGateway");
+Route::get("admin/update-gateway-request", "AdminController@updateGatewayRequest");
+
/*
* Theme Pages Routes
*/
[2/6] airavata-php-gateway git commit: AIRAVATA-2364 Deferring
loading sharing users until button clicked
Posted by ma...@apache.org.
AIRAVATA-2364 Deferring loading sharing users until button clicked
Project: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/commit/f06927dd
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/f06927dd
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/f06927dd
Branch: refs/heads/develop
Commit: f06927dd612b2f86cdd7b78e105fb94e611fa1f5
Parents: 975cfa6
Author: Marcus Christie <ma...@iu.edu>
Authored: Wed Apr 19 12:44:44 2017 -0400
Committer: Marcus Christie <ma...@iu.edu>
Committed: Wed Apr 19 12:44:44 2017 -0400
----------------------------------------------------------------------
app/controllers/ProjectController.php | 8 ++++++--
app/routes.php | 2 ++
app/views/project/create.blade.php | 1 +
public/js/sharing/share.js | 2 +-
4 files changed, 10 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/f06927dd/app/controllers/ProjectController.php
----------------------------------------------------------------------
diff --git a/app/controllers/ProjectController.php b/app/controllers/ProjectController.php
index 7651b25..ea6efd3 100755
--- a/app/controllers/ProjectController.php
+++ b/app/controllers/ProjectController.php
@@ -26,8 +26,7 @@ class ProjectController extends BaseController
public function createView()
{
if (Config::get('pga_config.airavata')["data-sharing-enabled"]){
- $users = SharingUtilities::getAllUserProfiles();
- return View::make("project/create", array("users" => json_encode($users), "owner" => json_encode(array())));
+ return View::make("project/create", array("users" => json_encode(array()), "owner" => json_encode(array())));
}else{
return View::make("project/no-sharing-create");
}
@@ -242,6 +241,11 @@ class ProjectController extends BaseController
return Response::json(array("error" => "Error: No project specified"));
}
}
+
+ public function allUsers()
+ {
+ return Response::json(SharingUtilities::getAllUserProfiles());
+ }
}
?>
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/f06927dd/app/routes.php
----------------------------------------------------------------------
diff --git a/app/routes.php b/app/routes.php
index 70bdc88..7c86629 100755
--- a/app/routes.php
+++ b/app/routes.php
@@ -91,6 +91,8 @@ Route::get("project/shared-users", "ProjectController@sharedUsers");
Route::get("project/unshared-users", "ProjectController@unsharedUsers");
+Route::get("project/all-users", "ProjectController@allUsers");
+
/*
* Experiment Routes
*/
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/f06927dd/app/views/project/create.blade.php
----------------------------------------------------------------------
diff --git a/app/views/project/create.blade.php b/app/views/project/create.blade.php
index 54d615c..759ca71 100755
--- a/app/views/project/create.blade.php
+++ b/app/views/project/create.blade.php
@@ -50,6 +50,7 @@
});
var users = {{ $users }};
var owner = {{ $owner }};
+ $('#entity-share').data({url: "{{URL::to('/')}}/project/all-users"});
</script>
{{ HTML::script('js/sharing/sharing_utils.js') }}
{{ HTML::script('js/sharing/share.js') }}
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/f06927dd/public/js/sharing/share.js
----------------------------------------------------------------------
diff --git a/public/js/sharing/share.js b/public/js/sharing/share.js
index bbea0d9..d36ff22 100755
--- a/public/js/sharing/share.js
+++ b/public/js/sharing/share.js
@@ -120,7 +120,7 @@ $(function() {
$.ajax({
url: ajax_data.url,
method: 'get',
- data: {resourceId: ajax_data.resourceId},
+ data: ajax_data.resourceId ? {resourceId: ajax_data.resourceId} : null,
dataType: "json",
error: function(xhr, status, error) {
$('#shared-users').addClass('text-align-center').text("Unable to load users from Airavata server.");