diff --git a/nginx/Dockerfile b/nginx/Dockerfile index b125547a09..218aff84cb 100644 --- a/nginx/Dockerfile +++ b/nginx/Dockerfile @@ -47,7 +47,8 @@ RUN apt-get update && \ supervisor \ shibboleth-sp-common \ shibboleth-sp-utils \ - php-fpm php-curl + fcgiwrap \ + python3-requests WORKDIR /tmp # dpkg-buildpackage names the .deb after the build host architecture @@ -58,11 +59,13 @@ RUN dpkg -i nginx_1.20.1-1~focal_*.deb ADD supervisord.conf /etc/supervisor/supervisord.conf +# supervisord.conf points shibauthorizer / shibresponder at the x86_64 +# library directory. Rewrite it for the build architecture (e.g. aarch64). +RUN sed -i "s#/usr/lib/x86_64-linux-gnu/shibboleth/#/usr/lib/$(uname -m)-linux-gnu/shibboleth/#g" \ + /etc/supervisor/supervisord.conf ADD shibboleth2.xml /etc/shibboleth/shibboleth2.xml ADD attribute-map.xml /etc/shibboleth/attribute-map.xml ADD attribute-policy.xml /etc/shibboleth/attribute-policy.xml -RUN sed -i 's/\/run\/php/\/tmp/g' /etc/php/7.4/fpm/php-fpm.conf && \ - sed -i 's/\/run\/php/\/tmp/g' /etc/php/7.4/fpm/pool.d/www.conf ADD ./keys/server.crt /etc/shibboleth/server.crt ADD ./keys/server.key /etc/shibboleth/server.key @@ -82,9 +85,8 @@ ADD redirect_list.map /etc/nginx/redirect_list.map 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 diff --git a/nginx/Dockerfile.ams b/nginx/Dockerfile.ams index 4aedca1ae5..b11d12ad2e 100644 --- a/nginx/Dockerfile.ams +++ b/nginx/Dockerfile.ams @@ -8,8 +8,6 @@ RUN apt-get update -y && \ RUN echo "deb http://nginx.org/packages/ubuntu focal nginx" | tee /etc/apt/sources.list.d/nginx.list RUN echo "deb-src http://nginx.org/packages/ubuntu focal nginx" | tee -a /etc/apt/sources.list.d/nginx.list RUN curl -fsSL https://nginx.org/keys/nginx_signing.key | apt-key add - -#RUN apt-get source -y nginx=1.18.0 -#RUN apt-get build-dep -y nginx=1.18.0 RUN apt-get update -y && \ apt-get source -y nginx=1.20.1 && \ apt-get build-dep -y nginx=1.20.1 @@ -19,42 +17,37 @@ RUN wget "https://github.com/samizdatco/nginx-http-auth-digest/archive/master.zi # https://github.com/nginx-shib/nginx-http-shibboleth RUN wget "https://github.com/nginx-shib/nginx-http-shibboleth/archive/v2.0.1.tar.gz" -O nginx-http-shibboleth-2.0.1.tar.gz RUN wget "https://github.com/openresty/headers-more-nginx-module/archive/v0.33.tar.gz" -O headers-more-nginx-module-0.33.tar.gz -RUN wget "https://github.com/apache/incubator-pagespeed-ngx/archive/v1.13.35.2-stable.tar.gz" -O incubator-pagespeed-ngx-1.13.35.2-stable.tar.gz RUN wget "https://github.com/FRiCKLE/ngx_cache_purge/archive/2.3.tar.gz" -O ngx_cache_purge-2.3.tar.gz RUN unzip nginx-http-auth-digest.zip && \ tar zxf nginx-http-shibboleth-2.0.1.tar.gz && \ tar zxf headers-more-nginx-module-0.33.tar.gz && \ - tar zxvf incubator-pagespeed-ngx-1.13.35.2-stable.tar.gz && \ tar zxf ngx_cache_purge-2.3.tar.gz -RUN cd /tmp/incubator-pagespeed-ngx-1.13.35.2-stable ; wget https://dl.google.com/dl/page-speed/psol/1.13.35.2-x64.tar.gz ; tar -xzvf 1.13.35.2-x64.tar.gz -#RUN sed -i "s#--modules-path=/usr/lib/nginx/modules#--modules-path=/usr/lib/nginx/modules --add-module=/tmp/headers-more-nginx-module-0.33 --add-module=/tmp/nginx-http-shibboleth-2.0.1 --add-module=/tmp/nginx-http-auth-digest-master --add-module=/tmp/incubator-pagespeed-ngx-1.13.35.2-stable --add-module=/tmp/ngx_cache_purge-2.3 #g" nginx-1.18.0/debian/rules -#RUN cd nginx-1.18.0 && dpkg-buildpackage -b -RUN sed -i "s#--modules-path=/usr/lib/nginx/modules#--modules-path=/usr/lib/nginx/modules --add-module=/tmp/headers-more-nginx-module-0.33 --add-module=/tmp/nginx-http-shibboleth-2.0.1 --add-module=/tmp/nginx-http-auth-digest-master --add-module=/tmp/incubator-pagespeed-ngx-1.13.35.2-stable --add-module=/tmp/ngx_cache_purge-2.3 #g" nginx-1.20.1/debian/rules +RUN sed -i "s#--modules-path=/usr/lib/nginx/modules#--modules-path=/usr/lib/nginx/modules --add-module=/tmp/headers-more-nginx-module-0.33 --add-module=/tmp/nginx-http-shibboleth-2.0.1 --add-module=/tmp/nginx-http-auth-digest-master --add-module=/tmp/ngx_cache_purge-2.3 #g" nginx-1.20.1/debian/rules 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 fcgiwrap python3-pip -RUN pip3 install requests +RUN apt-get update && apt-get install -y openssl wget curl unzip supervisor shibboleth-sp-common shibboleth-sp-utils fcgiwrap python3-requests WORKDIR /tmp -#COPY --from=nginx-with-shib /tmp/nginx_1.18.0-2~focal_amd64.deb . -#COPY --from=nginx-with-shib /tmp/nginx-dbg_1.18.0-2~focal_amd64.deb . -#RUN dpkg -i nginx_1.18.0-2~focal_amd64.deb -COPY --from=nginx-with-shib /tmp/nginx_1.20.1-1~focal_amd64.deb . -COPY --from=nginx-with-shib /tmp/nginx-dbg_1.20.1-1~focal_amd64.deb . -RUN dpkg -i nginx_1.20.1-1~focal_amd64.deb +# dpkg-buildpackage names the .deb after the build host architecture +# (amd64 / arm64), so match it with a wildcard instead of hard-coding it. +COPY --from=nginx-with-shib /tmp/nginx_1.20.1-1~focal_*.deb ./ +COPY --from=nginx-with-shib /tmp/nginx-dbg_1.20.1-1~focal_*.deb ./ +RUN dpkg -i nginx_1.20.1-1~focal_*.deb ADD supervisord.conf /etc/supervisor/supervisord.conf +# supervisord.conf points shibauthorizer / shibresponder at the x86_64 +# library directory. Rewrite it for the build architecture (e.g. aarch64). +RUN sed -i "s#/usr/lib/x86_64-linux-gnu/shibboleth/#/usr/lib/$(uname -m)-linux-gnu/shibboleth/#g" \ + /etc/supervisor/supervisord.conf ADD shibboleth2.xml /etc/shibboleth/shibboleth2.xml ADD attribute-map.xml /etc/shibboleth/attribute-map.xml ADD attribute-policy.xml /etc/shibboleth/attribute-policy.xml -RUN sed -i 's/\/run\/php/\/tmp/g' /etc/php/7.4/fpm/php-fpm.conf -RUN sed -i 's/\/run\/php/\/tmp/g' /etc/php/7.4/fpm/pool.d/www.conf ADD ./keys/server.crt /etc/shibboleth/server.crt ADD ./keys/server.key /etc/shibboleth/server.key @@ -75,8 +68,6 @@ ADD redirect_list.map /etc/nginx/redirect_list.map 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.py /usr/share/nginx/html/secure/login.py RUN chmod 755 /usr/share/nginx/html/secure/login.py diff --git a/nginx/Dockerfile.arm64 b/nginx/Dockerfile.arm64 index b125547a09..218aff84cb 100644 --- a/nginx/Dockerfile.arm64 +++ b/nginx/Dockerfile.arm64 @@ -47,7 +47,8 @@ RUN apt-get update && \ supervisor \ shibboleth-sp-common \ shibboleth-sp-utils \ - php-fpm php-curl + fcgiwrap \ + python3-requests WORKDIR /tmp # dpkg-buildpackage names the .deb after the build host architecture @@ -58,11 +59,13 @@ RUN dpkg -i nginx_1.20.1-1~focal_*.deb ADD supervisord.conf /etc/supervisor/supervisord.conf +# supervisord.conf points shibauthorizer / shibresponder at the x86_64 +# library directory. Rewrite it for the build architecture (e.g. aarch64). +RUN sed -i "s#/usr/lib/x86_64-linux-gnu/shibboleth/#/usr/lib/$(uname -m)-linux-gnu/shibboleth/#g" \ + /etc/supervisor/supervisord.conf ADD shibboleth2.xml /etc/shibboleth/shibboleth2.xml ADD attribute-map.xml /etc/shibboleth/attribute-map.xml ADD attribute-policy.xml /etc/shibboleth/attribute-policy.xml -RUN sed -i 's/\/run\/php/\/tmp/g' /etc/php/7.4/fpm/php-fpm.conf && \ - sed -i 's/\/run\/php/\/tmp/g' /etc/php/7.4/fpm/pool.d/www.conf ADD ./keys/server.crt /etc/shibboleth/server.crt ADD ./keys/server.key /etc/shibboleth/server.key @@ -82,9 +85,8 @@ ADD redirect_list.map /etc/nginx/redirect_list.map 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 diff --git a/nginx/index.php b/nginx/index.php deleted file mode 100644 index 1d4a3a952b..0000000000 --- a/nginx/index.php +++ /dev/null @@ -1,388 +0,0 @@ - - - - - - 属性受信の確認ページ - - - - - -
- -
- 属性受信の確認ページ
-あなたのIdPは、<" . htmlspecialchars($_SERVER['Shib-Identity-Provider']) . ">です。"; -?> -
-
- - - - - - - - - - - - - - - // of shib.conf. - // - // 3. shibd and httpd restart - // - $checkScopedAttribute = false; - //$checkScopedAttribute = true; - - function get_exportAssertion(){ - $eadata = ""; - $xml = simplexml_load_string(file_get_contents($_SERVER['Shib-Assertion-01'])); - foreach ( $xml->children("urn:oasis:names:tc:SAML:2.0:assertion")->AttributeStatement->Attribute as $attr) { - // eduPersonPrincipalName (ePPN) - if ((string)$attr->attributes()->Name == 'urn:oid:1.3.6.1.4.1.5923.1.1.1.6') { - $eadata["eppn"] = $attr->AttributeValue; - } - - // eduPersonScopedAffiliation (ePSA) - if ((string)$attr->attributes()->Name == 'urn:oid:1.3.6.1.4.1.5923.1.1.1.9') { - $affiliation_array = array(); - foreach ($attr->AttributeValue as $val) { - // Add a backslash to match the behavior of SP. - // example: "member;staff" --> "member\;staff" - $val = str_replace(';', '\\;', $val); - array_push($affiliation_array, $val); - } - $eadata["affiliation"] = (string)join(";", $affiliation_array); - } - - // eduPersonAffiliation (ePA) - if ((string)$attr->attributes()->Name == 'urn:oid:1.3.6.1.4.1.5923.1.1.1.1') { - $affiliation_array = array(); - foreach ($attr->AttributeValue as $val) { - // Add a backslash to match the behavior of SP. - // example: "member;staff@example.ac.jp" --> "member\;staff@example.ac.jp" - $val = str_replace(';', '\\;', $val); - array_push($affiliation_array, $val); - } - $eadata["unscoped-affiliation"] = (string)join(";", $affiliation_array); - } - - // gakuninScopedPersonalUniqueCode - if ((string)$attr->attributes()->Name == 'urn:oid:1.3.6.1.4.1.32264.1.1.6') { - $affiliation_array = array(); - foreach ($attr->AttributeValue as $val) { - // Add a backslash to match the behavior of SP. - // example: "faculty;staff:12345@example.ac.jp" --> "faculty\;staff:12345@example.ac.jp" - $val = str_replace(';', '\\;', $val); - array_push($affiliation_array, $val); - } - $eadata["gakuninScopedPersonalUniqueCode"] = (string)join(";", $affiliation_array); - } - - // eduPersonUniqueId - if ((string)$attr->attributes()->Name == 'urn:oid:1.3.6.1.4.1.5923.1.1.1.13') { - $eadata["eduPersonUniqueId"] = $attr->AttributeValue; - } - } - return $eadata; - } - - function normal_value($attr_value = ''){ - } - - function notice_value($attr_value = ''){ - if (strpos($attr_value, '\;') !== FALSE) - print '

注意:属性値にセミコロンが含まれているためSPによっては正しく動作しない可能性があります

'; - } - - function warning_value($attr_value = ''){ - if (strpos($attr_value, '\;') !== FALSE) - print '

警告:属性値にセミコロンが含まれているため正しくありません

'; - } - - function check_exportAssertion($attr, $attr_value = '', $ea_attr_value = ''){ - // scoped attributes (e.g. ePPN, ePSA) - $scoped_attrs = array( - "eppn", - "affiliation", - "gakuninScopedPersonalUniqueCode", - "eduPersonUniqueId", - "eduPersonScopedAffiliation", - ); - - // affiliation attributes (i.e. ePA, ePSA) - $affiliation_attrs = array( - "unscoped-affiliation", - "affiliation", - "eduPersonAffiliation", - "eduPersonScopedAffiliation", - ); - - // eduPersonAffiliation permissible values - // (eduPerson Object Class Specification (200806)) - $epaary = array( - "faculty", "student", "staff", "alum", "member", - "affiliate", "employee", "library-walk-in", - ); - - // Check of scope for scoped attributes (e.g. ePPN, ePSA) - if (in_array($attr, $scoped_attrs, true)) { - if (strcmp($attr_value, $ea_attr_value)) { - print '

警告:メタデータで定義されているスコープと送出された属性のスコープが一致していないか、利用できる属性値ではありません。
'; - print '(送出された属性値は' . $ea_attr_value . 'でした。)

'; - } - } - - // Check of vocabulary for affiliation attributes - if (in_array($attr, $affiliation_attrs, true)) { - $ea_attr_value_ary = preg_split("/(?警告:' . $val . "は利用できる属性値ではありません。

"; - } - } - - } - } - - $envary = array( - "eppn" => array("ePPN(eduPersonPrincipalName)" , "normal_value"), - "persistent-id" => array("eduPersonTargetedID" , "notice_value"), - "o" => array("o(organizationName)" , "normal_value"), - "jao" => array("jao(jaOrganizationName)[日本語]" , "normal_value"), - "ou" => array("ou(organizationalUnitName)" , "normal_value"), - "jaou" => array("jaou(jaOrganizationalUnitName)[日本語]" , "normal_value"), - "unscoped-affiliation" => array("職位(eduPersonAffiliation)" , "warning_value"), - "affiliation" => array("スコープ付き職位(eduPersonScopedAffiliation)" , "warning_value"), - "entitlement" => array("権限(eduPersonEntitlement)" , "notice_value"), - "mail" => array("メールアドレス(mail)" , "normal_value"), - "givenName" => array("名(givenName)" , "normal_value"), - "jaGivenName" => array("名(jaGivenName)[日本語]" , "normal_value"), - "sn" => array("姓(sn)" , "normal_value"), - "jasn" => array("姓(jasn)[日本語]" , "normal_value"), - "displayName" => array("表示名(displayName)" , "normal_value"), - "jaDisplayName" => array("表示名(jaDisplayName)[日本語]" , "normal_value"), - "gakuninScopedPersonalUniqueCode" - => array("gakuninScopedPersonalUniqueCode" , "notice_value"), - "isMemberOf" => array("isMemberOf" , "notice_value"), - "assurance" => array("eduPersonAssurance" , "notice_value"), - "eduPersonUniqueId" => array("eduPersonUniqueId" , "normal_value"), - "eduPersonOrcid" => array("eduPersonOrcid" , "notice_value"), - ); - - $chart_classes = array( - array("key" => "chart-key_even", "val" => "chart-value_even"), - array("key" => "chart-key_odd", "val" => "chart-value_odd" ), - ); - - $chart_class_notreceived = array( - "key" => "chart-key_notreceived", - "val" => "chart-value_notreceived"); - - if ($checkScopedAttribute === TRUE){ - $eadata=get_exportAssertion(); - } - - $i = 0; - foreach ($envary as $attr => $key) { - list($attr_description, $print_message) = $key; - - if ($i != 0) { - print "\n"; - } - - $chart_class = $chart_classes[$i % 2]; - - if (isset($_SERVER[$attr]) === FALSE) { - $chart_class = $chart_class_notreceived; - $val = "NOT RECEIVED"; - } else { - $val = htmlspecialchars($_SERVER[$attr], ENT_QUOTES, "UTF-8"); - } - - print ' '; - print ''; - print ''; - - $i = $i + 1; - } -?> - -
属性属性値
' . $attr_description . '' . $val; - print $print_message($_SERVER[$attr]); - - if ($checkScopedAttribute === TRUE && empty($eadata[$attr]) === FALSE){ - check_exportAssertion($attr, $_SERVER[$attr], $eadata[$attr]); - } - print '
-

現在のセッション情報の詳細はこちらへ。⇒セッション情報

-

このSPに対してログアウトする場合はこちらへ。⇒ログアウト
- (IdPに対してはログインした状態のままになりますのでご注意ください。
- IdPからもログアウトするためにはブラウザを閉じてください)

- - 0) { - print " \n"; - while (list($key, $value) = each($_SERVER)) { - print " \n"; - } - print "
$key" . htmlspecialchars($value, ENT_QUOTES, "UTF-8") . "
\n"; - } -?> - - - diff --git a/nginx/login.php b/nginx/login.php deleted file mode 100644 index 3aec5844a1..0000000000 --- a/nginx/login.php +++ /dev/null @@ -1,59 +0,0 @@ - - window.alert('Permission is invalid'); - window.location.href='".$base."';"; - //header("HTTP/1.1 403 Forbidden"); - //header("Location: ".$base); -}else{ - if(isset($_REQUEST['next'])){ - $next=$_REQUEST['next']; - }else{ - $next='%2F'; - } - // Post to the loopback address. WEKO accepts the attributes only from the - // addresses in WEKO_ACCOUNTS_SHIB_SP_ALLOWED_ADDRS, and nginx allows the - // POST to /weko/shib/login only from the loopback address. - $url = $_SERVER['REQUEST_SCHEME']."://127.0.0.1/weko/shib/login?next=".$next; - $curl = curl_init(); - $post_args=[]; - $post_args['SHIB_ATTR_USER_NAME']=$_SERVER['HTTP_WEKOID']; - $post_args["SHIB_ATTR_EPPN"]=$_SERVER['Remote-User']; - $post_args["SHIB_ATTR_MAIL"]=$_SERVER['mail']; - $post_args["SHIB_ATTR_SESSION_ID"]=$_SERVER['Shib-Session-ID']; - $post_args["SHIB_ATTR_ROLE_AUTHORITY_NAME"]=$_SERVER['HTTP_WEKOSOCIETYAFFILIATION']; - $options = array( - //Method - CURLOPT_POST => true,//POST - //body - CURLOPT_POSTFIELDS => http_build_query($post_args), - ); - $cookie=tempnam(sys_get_temp_dir(),'cookie_'); - //set options - curl_setopt($curl,CURLOPT_URL,$url); - curl_setopt($curl, CURLOPT_HTTPHEADER, array('Host: '.$_SERVER['SERVER_NAME'])); - curl_setopt($curl, CURLOPT_RETURNTRANSFER, true); - curl_setopt($curl,CURLOPT_SSL_VERIFYPEER, false); - curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, 0); - curl_setopt($curl, CURLOPT_COOKIESESSION, true); - curl_setopt_array($curl, $options); - curl_setopt($curl,CURLOPT_COOKIEJAR,$cookie); - curl_setopt($curl,CURLOPT_COOKIEFILE,$cookie); - // request - $result = curl_exec($curl); - $info = curl_getinfo($curl); - $errno = curl_errno($curl); - $error = curl_error($curl); - curl_close($curl); - if (CURLE_OK !== $errno) { - throw new RuntimeException($error, $errno); - } - header("HTTP/1.1 302 Found"); - header("Location: ".$base.$result); - //var_dump($app_cookies[0]['value']); -} -?> diff --git a/nginx/phpinfo.php b/nginx/phpinfo.php deleted file mode 100644 index c9f5eeb129..0000000000 --- a/nginx/phpinfo.php +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/nginx/supervisord.conf b/nginx/supervisord.conf index b343023a3b..04073b7973 100644 --- a/nginx/supervisord.conf +++ b/nginx/supervisord.conf @@ -32,16 +32,6 @@ socket_mode=0777 redirect_stderr=true priority=2 -[program:php-fpm] -command =/usr/sbin/php-fpm7.4 -F -autostart=true -autorestart=true -stdout_logfile=/dev/stdout -stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 -socket_mode=0777 - [fcgi-program:fcgiwrap] command=/usr/sbin/fcgiwrap -f socket=unix:///usr/lib/systemd/system/fcgiwrap.socket diff --git a/nginx/weko-ams-restricted.conf b/nginx/weko-ams-restricted.conf index 13fd43cf82..2563555971 100644 --- a/nginx/weko-ams-restricted.conf +++ b/nginx/weko-ams-restricted.conf @@ -119,24 +119,6 @@ server { alias /usr/share/shibboleth/; } - #A secured location.(Extension: .php) - location ~ /secure/(.*\.php)$ { - shib_request /shibauthorizer; - shib_request_use_headers on; - include shib_fastcgi_params; - include shib_clear_headers; - - more_clear_input_headers 'EPPN' 'DisplayName' 'Email' 'Persistent-Id'; - - fastcgi_pass unix:/tmp/php7.4-fpm.sock; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - include fastcgi_params; - root /usr/share/nginx/html; - - fastcgi_param NO_CHECK_WEKOSOCIETYAFFILIATION TRUE; - } - #A secured location.(Extension: .py) location ~ /secure/(.*\.py)$ { shib_request /shibauthorizer; @@ -147,7 +129,6 @@ server { more_clear_input_headers 'EPPN' 'DisplayName' 'Email' 'Persistent-Id'; fastcgi_pass unix:/usr/lib/systemd/system/fcgiwrap.socket; - # fastcgi_index index.php; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; include fastcgi_params; root /usr/share/nginx/html; @@ -172,7 +153,7 @@ server { # } # The attributes of the Shibboleth SP are posted only by the login script - # on this server (secure/login.py, login.php), over the loopback address. + # on this server (secure/login.py), over the loopback address. # The address is the one of the connection, before real_ip rewrites it with # X-Forwarded-For, so that a trusted proxy address cannot be used to pose # as the loopback address. WEKO checks the same address diff --git a/nginx/weko-ams.conf b/nginx/weko-ams.conf index c1ed4916da..f2790e9141 100644 --- a/nginx/weko-ams.conf +++ b/nginx/weko-ams.conf @@ -139,24 +139,6 @@ server { alias /usr/share/shibboleth/; } - #A secured location.(Extension: .php) - location ~ /secure/(.*\.php)$ { - shib_request /shibauthorizer; - shib_request_use_headers on; - include shib_fastcgi_params; - include shib_clear_headers; - - more_clear_input_headers 'EPPN' 'DisplayName' 'Email' 'Persistent-Id'; - - fastcgi_pass unix:/tmp/php7.4-fpm.sock; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - include fastcgi_params; - root /usr/share/nginx/html; - - fastcgi_param NO_CHECK_WEKOSOCIETYAFFILIATION TRUE; - } - #A secured location.(Extension: .py) location ~ /secure/(.*\.py)$ { shib_request /shibauthorizer; @@ -167,7 +149,6 @@ server { more_clear_input_headers 'EPPN' 'DisplayName' 'Email' 'Persistent-Id'; fastcgi_pass unix:/usr/lib/systemd/system/fcgiwrap.socket; - # fastcgi_index index.php; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; include fastcgi_params; root /usr/share/nginx/html; @@ -192,7 +173,7 @@ server { # } # The attributes of the Shibboleth SP are posted only by the login script - # on this server (secure/login.py, login.php), over the loopback address. + # on this server (secure/login.py), over the loopback address. # The address is the one of the connection, before real_ip rewrites it with # X-Forwarded-For, so that a trusted proxy address cannot be used to pose # as the loopback address. WEKO checks the same address diff --git a/nginx/weko.conf b/nginx/weko.conf index a681be8ddc..58dd2f6fe5 100644 --- a/nginx/weko.conf +++ b/nginx/weko.conf @@ -110,24 +110,6 @@ server { alias /usr/share/shibboleth/; } - # #A secured location.(Extension: .php) - # location ~ /secure/(.*\.php)$ { - # shib_request /shibauthorizer; - # shib_request_use_headers on; - # include shib_fastcgi_params; - # include shib_clear_headers; - - # more_clear_input_headers 'EPPN' 'DisplayName' 'Email' 'Persistent-Id'; - - # fastcgi_pass unix:/tmp/php7.4-fpm.sock; - # fastcgi_index index.php; - # fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - # include fastcgi_params; - # root /usr/share/nginx/html; - - # fastcgi_param NO_CHECK_WEKOSOCIETYAFFILIATION TRUE; - # } - # #A secured location.(Extension: .py) # location ~ /secure/(.*\.py)$ { # shib_request /shibauthorizer; @@ -138,7 +120,6 @@ server { # more_clear_input_headers 'EPPN' 'DisplayName' 'Email' 'Persistent-Id'; # fastcgi_pass unix:/usr/lib/systemd/system/fcgiwrap.socket; - # # fastcgi_index index.php; # fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; # include fastcgi_params; # root /usr/share/nginx/html; @@ -207,7 +188,7 @@ server { # } # The attributes of the Shibboleth SP are posted only by the login script - # on this server (secure/login.py, login.php), over the loopback address. + # on this server (secure/login.py), over the loopback address. # The address is the one of the connection, before real_ip rewrites it with # X-Forwarded-For, so that a trusted proxy address cannot be used to pose # as the loopback address. WEKO checks the same address