mirror of
https://github.com/abapGit/abapGit.git
synced 2025-05-01 12:20:51 +08:00
refactor, new http include
will later implement SAP login tokens and Digest authentification in the http include
This commit is contained in:
parent
6def021a1d
commit
3f599489d9
|
@ -3,7 +3,7 @@ REPORT zabapgit LINE-SIZE 100.
|
|||
* See http://www.abapgit.org
|
||||
|
||||
CONSTANTS: gc_xml_version TYPE string VALUE 'v1.0.0', "#EC NOTEXT
|
||||
gc_abap_version TYPE string VALUE 'v1.20.0'. "#EC NOTEXT
|
||||
gc_abap_version TYPE string VALUE 'v1.20.1'. "#EC NOTEXT
|
||||
|
||||
********************************************************************************
|
||||
* The MIT License (MIT)
|
||||
|
@ -53,6 +53,7 @@ INCLUDE zabapgit_stage.
|
|||
INCLUDE zabapgit_git_helpers.
|
||||
INCLUDE zabapgit_repo.
|
||||
INCLUDE zabapgit_stage_logic.
|
||||
INCLUDE zabapgit_http.
|
||||
INCLUDE zabapgit_git.
|
||||
INCLUDE zabapgit_objects.
|
||||
INCLUDE zabapgit_tadir.
|
||||
|
|
|
@ -34,12 +34,10 @@ CLASS lcl_git_transport DEFINITION FINAL.
|
|||
RETURNING VALUE(ro_branch_list) TYPE REF TO lcl_git_branch_list
|
||||
RAISING lcx_exception.
|
||||
|
||||
CLASS-METHODS class_constructor.
|
||||
* CLASS-METHODS class_constructor.
|
||||
|
||||
|
||||
PRIVATE SECTION.
|
||||
CLASS-DATA: gv_agent TYPE string.
|
||||
|
||||
CONSTANTS: BEGIN OF c_service,
|
||||
receive TYPE string VALUE 'receive', "#EC NOTEXT
|
||||
upload TYPE string VALUE 'upload', "#EC NOTEXT
|
||||
|
@ -71,24 +69,6 @@ CLASS lcl_git_transport DEFINITION FINAL.
|
|||
ii_client TYPE REF TO if_http_client
|
||||
RAISING lcx_exception.
|
||||
|
||||
CLASS-METHODS check_http_200
|
||||
IMPORTING ii_client TYPE REF TO if_http_client
|
||||
RAISING lcx_exception.
|
||||
|
||||
CLASS-METHODS send_receive
|
||||
IMPORTING ii_client TYPE REF TO if_http_client
|
||||
RAISING lcx_exception.
|
||||
|
||||
CLASS-METHODS check_auth_requested
|
||||
IMPORTING ii_client TYPE REF TO if_http_client
|
||||
RETURNING VALUE(rv_auth_requested) TYPE abap_bool
|
||||
RAISING lcx_exception.
|
||||
|
||||
CLASS-METHODS acquire_login_details
|
||||
IMPORTING ii_client TYPE REF TO if_http_client
|
||||
iv_url TYPE string
|
||||
RAISING lcx_exception.
|
||||
|
||||
ENDCLASS. "lcl_transport DEFINITION
|
||||
|
||||
*----------------------------------------------------------------------*
|
||||
|
@ -189,13 +169,6 @@ ENDCLASS. "lcl_pack DEFINITION
|
|||
*----------------------------------------------------------------------*
|
||||
CLASS lcl_git_transport IMPLEMENTATION.
|
||||
|
||||
METHOD class_constructor.
|
||||
|
||||
* bitbucket require agent prefix = "git/"
|
||||
gv_agent = 'git/abapGit-' && gc_abap_version.
|
||||
|
||||
ENDMETHOD. "class_constructor
|
||||
|
||||
METHOD set_headers.
|
||||
|
||||
DATA: lv_value TYPE string.
|
||||
|
@ -227,78 +200,6 @@ CLASS lcl_git_transport IMPLEMENTATION.
|
|||
|
||||
ENDMETHOD. "set_headers
|
||||
|
||||
METHOD check_http_200.
|
||||
|
||||
DATA: lv_code TYPE i,
|
||||
lv_text TYPE string.
|
||||
|
||||
|
||||
ii_client->response->get_status(
|
||||
IMPORTING
|
||||
code = lv_code ).
|
||||
CASE lv_code.
|
||||
WHEN 200.
|
||||
RETURN.
|
||||
WHEN 302.
|
||||
lcx_exception=>raise( 'HTTP redirect, check URL' ).
|
||||
WHEN 401.
|
||||
lcx_exception=>raise( 'HTTP 401, unauthorized' ).
|
||||
WHEN 403.
|
||||
lcx_exception=>raise( 'HTTP 403, forbidden' ).
|
||||
WHEN 404.
|
||||
lcx_exception=>raise( 'HTTP 404, not found' ).
|
||||
WHEN 415.
|
||||
lcx_exception=>raise( 'HTTP 415, unsupported media type' ).
|
||||
WHEN OTHERS.
|
||||
lv_text = ii_client->response->get_cdata( ).
|
||||
lcx_exception=>raise( |HTTP error code: { lv_code }, { lv_text }| ).
|
||||
ENDCASE.
|
||||
|
||||
ENDMETHOD. "http_200
|
||||
|
||||
METHOD check_auth_requested.
|
||||
|
||||
DATA: lv_code TYPE i.
|
||||
|
||||
ii_client->response->get_status(
|
||||
IMPORTING
|
||||
code = lv_code ).
|
||||
IF lv_code = 401.
|
||||
rv_auth_requested = abap_true.
|
||||
ENDIF.
|
||||
|
||||
ENDMETHOD. "check_auth_requested
|
||||
|
||||
METHOD acquire_login_details.
|
||||
DATA:
|
||||
lv_default_user TYPE string,
|
||||
lv_user TYPE string,
|
||||
lv_pass TYPE string.
|
||||
|
||||
lv_default_user = lcl_app=>user( )->get_repo_username( iv_url = iv_url ).
|
||||
lv_user = lv_default_user.
|
||||
|
||||
lcl_password_dialog=>popup(
|
||||
EXPORTING
|
||||
iv_repo_url = iv_url
|
||||
CHANGING
|
||||
cv_user = lv_user
|
||||
cv_pass = lv_pass ).
|
||||
|
||||
IF lv_user IS INITIAL.
|
||||
lcx_exception=>raise( 'HTTP 401, unauthorized' ).
|
||||
ENDIF.
|
||||
|
||||
IF lv_user <> lv_default_user.
|
||||
lcl_app=>user( )->set_repo_username( iv_url = iv_url iv_username = lv_user ).
|
||||
ENDIF.
|
||||
|
||||
ii_client->authenticate(
|
||||
username = lv_user
|
||||
password = lv_pass ).
|
||||
|
||||
ENDMETHOD. "acquire_login_details
|
||||
|
||||
METHOD find_branch.
|
||||
|
||||
DATA: lo_branch_list TYPE REF TO lcl_git_branch_list.
|
||||
|
@ -329,97 +230,28 @@ CLASS lcl_git_transport IMPLEMENTATION.
|
|||
IMPORTING
|
||||
ei_client = li_client
|
||||
eo_branch_list = ro_branch_list ).
|
||||
|
||||
li_client->close( ).
|
||||
|
||||
ENDMETHOD. "branches
|
||||
|
||||
METHOD branch_list.
|
||||
|
||||
DATA: lv_data TYPE string,
|
||||
lv_uri TYPE string,
|
||||
lv_expect_potentual_auth TYPE abap_bool,
|
||||
lo_settings TYPE REF TO lcl_settings.
|
||||
DATA: lv_data TYPE string.
|
||||
|
||||
lo_settings = lcl_app=>settings( )->read( ).
|
||||
|
||||
cl_http_client=>create_by_url(
|
||||
EXPORTING
|
||||
url = lcl_url=>host( iv_url )
|
||||
ssl_id = 'ANONYM'
|
||||
proxy_host = lo_settings->get_proxy_url( )
|
||||
proxy_service = lo_settings->get_proxy_port( )
|
||||
IMPORTING
|
||||
client = ei_client ).
|
||||
|
||||
ei_client->request->set_cdata( '' ).
|
||||
ei_client->request->set_header_field(
|
||||
name = '~request_method'
|
||||
value = 'GET' ).
|
||||
ei_client->request->set_header_field(
|
||||
name = 'user-agent'
|
||||
value = gv_agent ). "#EC NOTEXT
|
||||
lv_uri = lcl_url=>path_name( iv_url ) &&
|
||||
'/info/refs?service=git-' &&
|
||||
iv_service &&
|
||||
'-pack'.
|
||||
ei_client->request->set_header_field(
|
||||
name = '~request_uri'
|
||||
value = lv_uri ).
|
||||
|
||||
" Disable internal auth dialog (due to its unclarity)
|
||||
ei_client->propertytype_logon_popup = if_http_client=>co_disabled.
|
||||
|
||||
lv_expect_potentual_auth = boolc(
|
||||
lcl_login_manager=>load( iv_uri = iv_url
|
||||
ii_client = ei_client ) IS INITIAL ).
|
||||
|
||||
send_receive( ei_client ).
|
||||
IF lv_expect_potentual_auth = abap_true
|
||||
AND check_auth_requested( ei_client ) = abap_true.
|
||||
acquire_login_details( ii_client = ei_client iv_url = iv_url ).
|
||||
send_receive( ei_client ).
|
||||
ENDIF.
|
||||
check_http_200( ei_client ).
|
||||
|
||||
lcl_login_manager=>save( iv_uri = iv_url
|
||||
ii_client = ei_client ).
|
||||
ei_client = lcl_http=>create_by_url(
|
||||
iv_url = iv_url
|
||||
iv_service = iv_service ).
|
||||
|
||||
lv_data = ei_client->response->get_cdata( ).
|
||||
CREATE OBJECT eo_branch_list EXPORTING iv_data = lv_data.
|
||||
|
||||
CREATE OBJECT eo_branch_list
|
||||
EXPORTING
|
||||
iv_data = lv_data.
|
||||
|
||||
ENDMETHOD. "branch_list
|
||||
|
||||
METHOD send_receive.
|
||||
|
||||
DATA lv_text TYPE string.
|
||||
|
||||
ii_client->send( ).
|
||||
ii_client->receive(
|
||||
EXCEPTIONS
|
||||
http_communication_failure = 1
|
||||
http_invalid_state = 2
|
||||
http_processing_failed = 3
|
||||
OTHERS = 4 ).
|
||||
IF sy-subrc <> 0.
|
||||
CASE sy-subrc.
|
||||
WHEN 1.
|
||||
" make sure:
|
||||
" a) SSL is setup properly in STRUST
|
||||
" b) no firewalls
|
||||
" check trace file in transaction SMICM
|
||||
lv_text = 'HTTP Communication Failure'. "#EC NOTEXT
|
||||
WHEN 2.
|
||||
lv_text = 'HTTP Invalid State'. "#EC NOTEXT
|
||||
WHEN 3.
|
||||
lv_text = 'HTTP Processing failed'. "#EC NOTEXT
|
||||
WHEN OTHERS.
|
||||
lv_text = 'Another error occured'. "#EC NOTEXT
|
||||
ENDCASE.
|
||||
lcx_exception=>raise( lv_text ).
|
||||
ENDIF.
|
||||
|
||||
ENDMETHOD. "send_receive
|
||||
|
||||
METHOD receive_pack.
|
||||
|
||||
DATA: li_client TYPE REF TO if_http_client,
|
||||
|
@ -445,7 +277,7 @@ CLASS lcl_git_transport IMPLEMENTATION.
|
|||
iv_service = c_service-receive
|
||||
ii_client = li_client ).
|
||||
|
||||
lv_cap_list = 'report-status agent=' && gv_agent ##NO_TEXT.
|
||||
lv_cap_list = 'report-status agent=' && lcl_http=>get_agent( ) ##NO_TEXT.
|
||||
|
||||
lv_line = iv_old &&
|
||||
` ` &&
|
||||
|
@ -465,8 +297,8 @@ CLASS lcl_git_transport IMPLEMENTATION.
|
|||
|
||||
li_client->request->set_data( lv_xstring ).
|
||||
|
||||
send_receive( li_client ).
|
||||
check_http_200( li_client ).
|
||||
lcl_http=>send_receive( li_client ).
|
||||
lcl_http=>check_http_200( li_client ).
|
||||
|
||||
lv_xstring = li_client->response->get_data( ).
|
||||
li_client->close( ).
|
||||
|
@ -553,7 +385,7 @@ CLASS lcl_git_transport IMPLEMENTATION.
|
|||
|
||||
LOOP AT lt_branches FROM 1 ASSIGNING <ls_branch>.
|
||||
IF sy-tabix = 1.
|
||||
lv_capa = 'side-band-64k no-progress multi_ack agent=' && gv_agent ##NO_TEXT.
|
||||
lv_capa = 'side-band-64k no-progress multi_ack agent=' && lcl_http=>get_agent( ) ##NO_TEXT.
|
||||
lv_line = 'want' && ` ` && <ls_branch>-sha1
|
||||
&& ` ` && lv_capa && gc_newline. "#EC NOTEXT
|
||||
ELSE.
|
||||
|
@ -573,8 +405,8 @@ CLASS lcl_git_transport IMPLEMENTATION.
|
|||
|
||||
* do not use set_cdata as it modifies the Content-Type header field
|
||||
li_client->request->set_data( lcl_convert=>string_to_xstring_utf8( lv_buffer ) ).
|
||||
send_receive( li_client ).
|
||||
check_http_200( li_client ).
|
||||
lcl_http=>send_receive( li_client ).
|
||||
lcl_http=>check_http_200( li_client ).
|
||||
lv_xstring = li_client->response->get_data( ).
|
||||
li_client->close( ).
|
||||
|
||||
|
|
202
src/zabapgit_http.prog.abap
Normal file
202
src/zabapgit_http.prog.abap
Normal file
|
@ -0,0 +1,202 @@
|
|||
*&---------------------------------------------------------------------*
|
||||
*& Include ZABAPGIT_HTTP
|
||||
*&---------------------------------------------------------------------*
|
||||
|
||||
CLASS lcl_http DEFINITION FINAL.
|
||||
|
||||
PUBLIC SECTION.
|
||||
CLASS-METHODS:
|
||||
check_http_200
|
||||
IMPORTING ii_client TYPE REF TO if_http_client
|
||||
RAISING lcx_exception,
|
||||
send_receive
|
||||
IMPORTING ii_client TYPE REF TO if_http_client
|
||||
RAISING lcx_exception,
|
||||
get_agent
|
||||
RETURNING VALUE(rv_agent) TYPE string,
|
||||
create_by_url
|
||||
IMPORTING iv_url TYPE string
|
||||
iv_service TYPE string
|
||||
RETURNING VALUE(ri_client) TYPE REF TO if_http_client
|
||||
RAISING lcx_exception.
|
||||
|
||||
PRIVATE SECTION.
|
||||
CLASS-METHODS:
|
||||
check_auth_requested
|
||||
IMPORTING ii_client TYPE REF TO if_http_client
|
||||
RETURNING VALUE(rv_auth_requested) TYPE abap_bool
|
||||
RAISING lcx_exception,
|
||||
acquire_login_details
|
||||
IMPORTING ii_client TYPE REF TO if_http_client
|
||||
iv_url TYPE string
|
||||
RAISING lcx_exception.
|
||||
|
||||
ENDCLASS.
|
||||
|
||||
CLASS lcl_http IMPLEMENTATION.
|
||||
|
||||
METHOD get_agent.
|
||||
|
||||
* bitbucket require agent prefix = "git/"
|
||||
rv_agent = 'git/abapGit-' && gc_abap_version.
|
||||
|
||||
ENDMETHOD.
|
||||
|
||||
METHOD create_by_url.
|
||||
|
||||
DATA: lv_uri TYPE string,
|
||||
lv_expect_potentual_auth TYPE abap_bool,
|
||||
lo_settings TYPE REF TO lcl_settings.
|
||||
|
||||
|
||||
lo_settings = lcl_app=>settings( )->read( ).
|
||||
|
||||
cl_http_client=>create_by_url(
|
||||
EXPORTING
|
||||
url = lcl_url=>host( iv_url )
|
||||
ssl_id = 'ANONYM'
|
||||
proxy_host = lo_settings->get_proxy_url( )
|
||||
proxy_service = lo_settings->get_proxy_port( )
|
||||
IMPORTING
|
||||
client = ri_client ).
|
||||
|
||||
ri_client->request->set_cdata( '' ).
|
||||
ri_client->request->set_header_field(
|
||||
name = '~request_method'
|
||||
value = 'GET' ).
|
||||
ri_client->request->set_header_field(
|
||||
name = 'user-agent'
|
||||
value = get_agent( ) ). "#EC NOTEXT
|
||||
lv_uri = lcl_url=>path_name( iv_url ) &&
|
||||
'/info/refs?service=git-' &&
|
||||
iv_service &&
|
||||
'-pack'.
|
||||
ri_client->request->set_header_field(
|
||||
name = '~request_uri'
|
||||
value = lv_uri ).
|
||||
|
||||
" Disable internal auth dialog (due to its unclarity)
|
||||
ri_client->propertytype_logon_popup = if_http_client=>co_disabled.
|
||||
|
||||
lv_expect_potentual_auth = boolc(
|
||||
lcl_login_manager=>load( iv_uri = iv_url
|
||||
ii_client = ri_client ) IS INITIAL ).
|
||||
|
||||
send_receive( ri_client ).
|
||||
IF lv_expect_potentual_auth = abap_true
|
||||
AND check_auth_requested( ri_client ) = abap_true.
|
||||
acquire_login_details( ii_client = ri_client
|
||||
iv_url = iv_url ).
|
||||
send_receive( ri_client ).
|
||||
ENDIF.
|
||||
check_http_200( ri_client ).
|
||||
|
||||
lcl_login_manager=>save( iv_uri = iv_url
|
||||
ii_client = ri_client ).
|
||||
|
||||
ENDMETHOD.
|
||||
|
||||
METHOD send_receive.
|
||||
|
||||
DATA lv_text TYPE string.
|
||||
|
||||
ii_client->send( ).
|
||||
ii_client->receive(
|
||||
EXCEPTIONS
|
||||
http_communication_failure = 1
|
||||
http_invalid_state = 2
|
||||
http_processing_failed = 3
|
||||
OTHERS = 4 ).
|
||||
IF sy-subrc <> 0.
|
||||
CASE sy-subrc.
|
||||
WHEN 1.
|
||||
" make sure:
|
||||
" a) SSL is setup properly in STRUST
|
||||
" b) no firewalls
|
||||
" check trace file in transaction SMICM
|
||||
lv_text = 'HTTP Communication Failure'. "#EC NOTEXT
|
||||
WHEN 2.
|
||||
lv_text = 'HTTP Invalid State'. "#EC NOTEXT
|
||||
WHEN 3.
|
||||
lv_text = 'HTTP Processing failed'. "#EC NOTEXT
|
||||
WHEN OTHERS.
|
||||
lv_text = 'Another error occured'. "#EC NOTEXT
|
||||
ENDCASE.
|
||||
lcx_exception=>raise( lv_text ).
|
||||
ENDIF.
|
||||
|
||||
ENDMETHOD. "send_receive
|
||||
|
||||
METHOD check_auth_requested.
|
||||
|
||||
DATA: lv_code TYPE i.
|
||||
|
||||
ii_client->response->get_status(
|
||||
IMPORTING
|
||||
code = lv_code ).
|
||||
IF lv_code = 401.
|
||||
rv_auth_requested = abap_true.
|
||||
ENDIF.
|
||||
|
||||
ENDMETHOD. "check_auth_requested
|
||||
|
||||
METHOD acquire_login_details.
|
||||
DATA:
|
||||
lv_default_user TYPE string,
|
||||
lv_user TYPE string,
|
||||
lv_pass TYPE string.
|
||||
|
||||
lv_default_user = lcl_app=>user( )->get_repo_username( iv_url = iv_url ).
|
||||
lv_user = lv_default_user.
|
||||
|
||||
lcl_password_dialog=>popup(
|
||||
EXPORTING
|
||||
iv_repo_url = iv_url
|
||||
CHANGING
|
||||
cv_user = lv_user
|
||||
cv_pass = lv_pass ).
|
||||
|
||||
IF lv_user IS INITIAL.
|
||||
lcx_exception=>raise( 'HTTP 401, unauthorized' ).
|
||||
ENDIF.
|
||||
|
||||
IF lv_user <> lv_default_user.
|
||||
lcl_app=>user( )->set_repo_username( iv_url = iv_url iv_username = lv_user ).
|
||||
ENDIF.
|
||||
|
||||
ii_client->authenticate(
|
||||
username = lv_user
|
||||
password = lv_pass ).
|
||||
|
||||
ENDMETHOD. "acquire_login_details
|
||||
|
||||
METHOD check_http_200.
|
||||
|
||||
DATA: lv_code TYPE i,
|
||||
lv_text TYPE string.
|
||||
|
||||
|
||||
ii_client->response->get_status(
|
||||
IMPORTING
|
||||
code = lv_code ).
|
||||
CASE lv_code.
|
||||
WHEN 200.
|
||||
RETURN.
|
||||
WHEN 302.
|
||||
lcx_exception=>raise( 'HTTP redirect, check URL' ).
|
||||
WHEN 401.
|
||||
lcx_exception=>raise( 'HTTP 401, unauthorized' ).
|
||||
WHEN 403.
|
||||
lcx_exception=>raise( 'HTTP 403, forbidden' ).
|
||||
WHEN 404.
|
||||
lcx_exception=>raise( 'HTTP 404, not found' ).
|
||||
WHEN 415.
|
||||
lcx_exception=>raise( 'HTTP 415, unsupported media type' ).
|
||||
WHEN OTHERS.
|
||||
lv_text = ii_client->response->get_cdata( ).
|
||||
lcx_exception=>raise( |HTTP error code: { lv_code }, { lv_text }| ).
|
||||
ENDCASE.
|
||||
|
||||
ENDMETHOD. "http_200
|
||||
|
||||
ENDCLASS.
|
48
src/zabapgit_http.prog.xml
Normal file
48
src/zabapgit_http.prog.xml
Normal file
|
@ -0,0 +1,48 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<abapGit version="v1.0.0" serializer="LCL_OBJECT_PROG" serializer_version="v1.0.0">
|
||||
<asx:abap xmlns:asx="http://www.sap.com/abapxml" version="1.0">
|
||||
<asx:values>
|
||||
<PROGDIR>
|
||||
<NAME>ZABAPGIT_HTTP</NAME>
|
||||
<STATE>A</STATE>
|
||||
<SQLX/>
|
||||
<EDTX/>
|
||||
<VARCL>X</VARCL>
|
||||
<DBAPL/>
|
||||
<DBNA/>
|
||||
<CLAS/>
|
||||
<TYPE/>
|
||||
<OCCURS/>
|
||||
<SUBC>I</SUBC>
|
||||
<APPL/>
|
||||
<SECU/>
|
||||
<CNAM/>
|
||||
<CDAT>0000-00-00</CDAT>
|
||||
<UNAM/>
|
||||
<UDAT>0000-00-00</UDAT>
|
||||
<VERN/>
|
||||
<LEVL/>
|
||||
<RSTAT/>
|
||||
<RMAND/>
|
||||
<RLOAD>E</RLOAD>
|
||||
<FIXPT/>
|
||||
<SSET/>
|
||||
<SDATE>0000-00-00</SDATE>
|
||||
<STIME/>
|
||||
<IDATE>0000-00-00</IDATE>
|
||||
<ITIME/>
|
||||
<LDBNAME/>
|
||||
<UCCHECK>X</UCCHECK>
|
||||
</PROGDIR>
|
||||
<TPOOL>
|
||||
<item>
|
||||
<ID>R</ID>
|
||||
<KEY/>
|
||||
<ENTRY>Include ZABAPGIT_HTTP</ENTRY>
|
||||
<LENGTH>21</LENGTH>
|
||||
<SPLIT/>
|
||||
</item>
|
||||
</TPOOL>
|
||||
</asx:values>
|
||||
</asx:abap>
|
||||
</abapGit>
|
Loading…
Reference in New Issue
Block a user